[Pkg-privacy-commits] [vidalia] 35/160: Uploaded l10n-english reviewed template, and re-started translation round (commiting ca.po now, cleaned some fuzzy comments in the way) Improved pkg documentation with very detailed steps and explanations.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:13:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository vidalia.
commit 7db077b974823826f5451ef714afa51e97add876
Author: Dererk <dererk at melee.dererk.com.ar>
Date: Mon Sep 27 00:03:51 2010 -0300
Uploaded l10n-english reviewed template, and re-started translation
round (commiting ca.po now, cleaned some fuzzy comments in the way)
Improved pkg documentation with very detailed steps and
explanations.
---
debian/0.2.x/README.Debian | 130 +++++++++++++---
debian/0.2.x/config | 11 +-
debian/0.2.x/po/ca.po | 151 ++++++-------------
debian/0.2.x/po/cs.po | 131 ++++------------
debian/0.2.x/po/da.po | 159 ++++----------------
debian/0.2.x/po/de.po | 131 ++++------------
debian/0.2.x/po/es.po | 132 ++++-------------
debian/0.2.x/po/fi.po | 126 ++++------------
debian/0.2.x/po/fr.po | 133 ++++-------------
debian/0.2.x/po/it.po | 164 ++++-----------------
debian/0.2.x/po/pt.po | 131 ++++------------
debian/0.2.x/po/ru.po | 132 ++++-------------
debian/0.2.x/po/sv.po | 131 ++++------------
debian/0.2.x/po/templates.pot | 126 ++++------------
debian/0.2.x/po/vi.po | 132 ++++-------------
debian/0.2.x/po/zh_CN.po | 154 ++++---------------
debian/0.2.x/po/zh_TW.po | 153 ++++---------------
debian/0.2.x/templates | 69 +++------
.../vidalia-0.2.9-1+squeeze1/debian/README.Debian | 133 ++++++++++++++---
.../vidalia-0.2.9-1+squeeze1/debian/config | 11 +-
.../vidalia-0.2.9-1+squeeze1/debian/po/ca.po | 151 ++++++-------------
.../vidalia-0.2.9-1+squeeze1/debian/po/cs.po | 131 ++++------------
.../vidalia-0.2.9-1+squeeze1/debian/po/da.po | 159 ++++----------------
.../vidalia-0.2.9-1+squeeze1/debian/po/de.po | 131 ++++------------
.../vidalia-0.2.9-1+squeeze1/debian/po/es.po | 132 ++++-------------
.../vidalia-0.2.9-1+squeeze1/debian/po/fi.po | 126 ++++------------
.../vidalia-0.2.9-1+squeeze1/debian/po/fr.po | 133 ++++-------------
.../vidalia-0.2.9-1+squeeze1/debian/po/it.po | 164 ++++-----------------
.../vidalia-0.2.9-1+squeeze1/debian/po/pt.po | 131 ++++------------
.../vidalia-0.2.9-1+squeeze1/debian/po/ru.po | 132 ++++-------------
.../vidalia-0.2.9-1+squeeze1/debian/po/sv.po | 131 ++++------------
.../debian/po/templates.pot | 126 ++++------------
.../vidalia-0.2.9-1+squeeze1/debian/po/vi.po | 132 ++++-------------
.../vidalia-0.2.9-1+squeeze1/debian/po/zh_CN.po | 152 ++++---------------
.../vidalia-0.2.9-1+squeeze1/debian/po/zh_TW.po | 151 ++++---------------
.../vidalia-0.2.9-1+squeeze1/debian/templates | 69 +++------
36 files changed, 1101 insertions(+), 3490 deletions(-)
diff --git a/debian/0.2.x/README.Debian b/debian/0.2.x/README.Debian
index 53dbbe1..ea168c1 100644
--- a/debian/0.2.x/README.Debian
+++ b/debian/0.2.x/README.Debian
@@ -1,46 +1,128 @@
Vidalia for Debian
------------------
-There are currently two ways of communication supported between
-Tor daemon (carried with 'tor' package), and Vidalia interface:
+ For the anxious and patienceless people
+ ---------------------------------------
+
+3 different ways of running Vidalia:
+
+1. Re/Configure Vidalia not to let Tor to start and simply start Vidalia.
+2. Enable CookieAuthentication at tor's config, and grab
+ /var/lib/tor/control_auth_cookie (RECOMMENDED for strength security)
+3. Enable ControlPort and use HashedControlPassword got from
+ 'tor --hash-password'.
+
+
+
+
+ Full and complete explanation
+ -----------------------------
+
+
+Vidalia provides a GUI for the Tor software.
+That means that Vidalia needs to talk to the Tor software for configuring
+different aspects of the Tor Network, view its status at a glance,
+monitor its bandwidth usage, or just view logs between others
+
+The component of the Tor software that Vidalia talks to is a daemon process,
+which works on background without any user interaction required.
+
+Vidalia support three different ways of talking to Tor:
+
1. Letting Vidalia start Tor process on its own.
---------------------------------------------
- This is default option on debconf while configuring vidalia package
- (easy reconfigurable by running 'dpkg-reconfigure vidalia').
+ ------> "I want it, and I want it NOW!"
+
+ This option is the simplest for end users.
+
+ This is default option on debconf while configuring vidalia package, handled
+ in the debconf front-end to Vidalia, easily reconfigurable by running
+ 'dpkg-reconfigure vidalia' at any given time.
+
- This is now handled in the debconf front-end to Vidalia. If you decide you no
- longer wish to have Vidalia control Tor, and want to re-enable Tor's ability to
- start when your machine boots, dpkg-reconfigure vidalia and choose 'no'.
+ *********************** FOR PARANOIDS ONLY ***************************
+ | |
+ | |
+ | In the remote and unlikely event of existing a bug on the |
+ | Tor routing algorithm or implementation itself, it might |
+ | _relatively_ easy, or unless possible, for a remote user to |
+ | access to the user's launching Vidalia information, |
+ | known as "privilege escalation attacks". |
+ | |
+ | |
+ | This will be much more difficult if you run Vidalia on any |
+ | of the next two alternatives described below. |
+ | |
+ | |
+ | ** Please consider using them if possible!!!! ** |
+ | |
+ | |
+ *********************** FOR PARANOIDS ONLY ***************************
-2. Enable Tor to use a control port to communicate with Vidalia.
+2. Enable Tor to use CookieAuthentication to communicate with Vidalia.
+ -------------------------------------------------------------------
+
+ * The better password is the one you don't have to know about *
+
+ This method consists in a password-less authentication. This means
+ you wont have to remember any password, but you'll have to grab a
+ very important and *SECRET* file from your disc, called "Auth Cookie".
+
+ To enable this profile, edit Tor configuration file, by default at
+ '/etc/tor/torrc', add or uncomment the 'CookieAuthentication' value
+ and setting it to 1.
+ You will end up having something like this:
+
+# grep Cookie /etc/tor/torrc
+CookieAuthentication 1
+
+ Now start/restart Tor daemon and start Vidalia from your regular X user.
+ Vidalia will ask you for a "cookie file" at the next run:
+
+ ------------------------------------------------------------------------
+ You will have to fetch the "cookie file" from your local filesystem,
+ by default at '/var/lib/tor/control_auth_cookie'
+
+ DO NOT share this file to anyone, Tor rests on it!
+ ------------------------------------------------------------------------
+
+ This option might be simpler than all the others, but will require you
+ to grab a different cookie file every time you restart the Tor process,
+ on contrast to the next methods.
+
+ This is my prefer and recommended method, simple and easy, no passwords.
+
+
+
+3. Enable Tor to use a control port to communicate with Vidalia.
-------------------------------------------------------------
- This can be easily done by editing Tor configuration file, by default
- '/etc/tor/torrc', adding or uncommenting the 'ControlPort=9051' option,
- and adding the proper value to 'HashedControlPassword', as shown below:
+ Edit Tor configuration file, by default '/etc/tor/torrc', add or
+ uncomment the 'ControlPort 9051' option, and adding the output
+ you get from tor to 'HashedControlPassword', as shown here:
- # tor --hash-password SOME_PASSWORD_HERE
- Sep 17 18:48:49.421 [notice] Tor v0.2.0.30 (r15956). This is experimental
- software. Do not rely on it for strong anonymity. (Running on Linux x86_64)
+# tor --hash-password SOME_PASSWORD_HERE
+Sep 17 18:48:49.421 [notice] Tor v0.2.0.30 (r15956). This is experimental
+software. Do not rely on it for strong anonymity. (Running on Linux x86_64)
16:167F667A98F859D2600BD708B48B95343FEF7800B479E2AA4284ACF029
- You will have to have something like this:
- # grep Control /etc/tor/torrc
- ControlPort 9051
- HashedControlPassword 16:167F667A98F859D2600BD708B48B95343FEF7800B479E2AA4284ACF029
+ You will end having something like this:
+
+# grep Control /etc/tor/torrc
+ControlPort 9051
+HashedControlPassword 16:167F667A98F...4ACF029
- Then start/restart Tor daemon and then run Vidalia GUI.
- It will ask Tor what auth modes it accepts and if everything is OK,
- You will be asked for the password, in the example, 'SOME_PASSWORD_HERE'
- (as you pass it with --hash-password, not the hash).
+ Now start/restart Tor daemon and start Vidalia from your regular X user.
+ Vidalia will ask you for that password at the next run, in the example,
+ 'SOME_PASSWORD_HERE' (as the phrase you pass it with --hash-password,
+ not the hash), an will start a secure authentication. That's all!
- -- Ulises Vitulli <dererk at debian.org> Wed, 17 Sep 2008 17:24:06 -0300
- (Updated by Erinn Clark <erinn at torproject.org> Sun, 04 Apr 2010 20:16:07 -0700)
+ -- Ulises Vitulli <dererk at debian.org> Fri, 24 Sep 2010 11:18:20 -0300
diff --git a/debian/0.2.x/config b/debian/0.2.x/config
index 3b882fe..dc061e5 100644
--- a/debian/0.2.x/config
+++ b/debian/0.2.x/config
@@ -5,12 +5,9 @@ if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
fi
-
seen='false'
askuser() {
- info='vidalia/info'
question='vidalia/tor-daemon-interaction'
- db_input high $info || true
db_input high $question || true
db_go || true
db_get $question
@@ -24,18 +21,18 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
askuser
seen='true'
case "$RET" in
- (no)
+ (nothing)
if [ -f /etc/default/tor.vidalia ]; then
ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
fi
;;
- (yes-now)
+ (one-off)
invoke-rc.d --force tor stop
if [ -f /etc/default/tor.vidalia ]; then
ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
fi
;;
- (yes-always)
+ (permanent)
invoke-rc.d --force tor stop
ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-off /etc/default/tor.vidalia
;;
@@ -47,7 +44,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
# still running?? (e.g. chroot)
if [ "$seen" = "false" ]; then
askuser
- if [ "$RET" = "true" ]; then
+ if [ "$RET" = "nothing" ] || [ "$RET" = "one-off" ]; then
echo -n "Stopping tor daemon: "
pkill -x tor > /dev/null && echo "tor." || echo 'Failed!'
fi
diff --git a/debian/0.2.x/po/ca.po b/debian/0.2.x/po/ca.po
index 4486aa9..b4b328f 100644
--- a/debian/0.2.x/po/ca.po
+++ b/debian/0.2.x/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.9-1\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 19:11-0300\n"
"PO-Revision-Date: 2008-09-17 16:17-0300\n"
"Last-Translator: Ulises Vitulli <uvitulli at fi.uba.ar>\n"
"Language-Team: \n"
@@ -15,123 +15,62 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr ""
+#: ../templates:1001
+msgid "No Configuration"
+msgstr "Sense configuració"
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr ""
+#: ../templates:1001
+msgid "One-off restart"
+msgstr "Reinicia una vegada"
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr ""
+#: ../templates:1001
+msgid "Permanent takeover"
+msgstr "Control permanent"
#. Type: select
#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr ""
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
+msgstr "Interacció Tor/Vidalia"
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
+msgstr "Vidalia ho necessita per comunicar-se amb el dimoni que s'executa "
+"de manera que pot proporcionar una interfície d'usuari gràfica per ell. "
+" Açò necessita que es reconfigure manualment Tor per a que permeta una "
+"autentificació segura (el recomanat) o que es reinicie Tor amb el control"
+"de Vidalia.\n"
+" * Sense configuració:\n"
+" deixa Tor funcionant per ara. Vidalia no es podrà comunicar\n"
+" amb Tor fins que es reconfigure de forma manual - vegeu\n"
+" \"/usr/share/doc/vidalia/README.Debian\" per obtenir més detalls;\n"
+" * Reinicia una vegada:\n"
+" atura Tor ara de manera que Vidalia el puga engegar, tan sols esta\n"
+" vegada - Tor s'arrencarà automàticament en els reinicis, de manera\n"
+" que la configuració manual encara farà falta\n"
+" * Control permanent:\n"
+" atura Tor i permet simplement a Vidalia controlar que s'engegarà quan\n"
+" s'executa Vidalia (no es pot utilitzar en sistemes multiusuari)."
diff --git a/debian/0.2.x/po/cs.po b/debian/0.2.x/po/cs.po
index a636597..f20e808 100644
--- a/debian/0.2.x/po/cs.po
+++ b/debian/0.2.x/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.1.13-3\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-04-30 20:19+0200\n"
"Last-Translator: Martin Sin <martin.sin at zshk.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -14,125 +14,48 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Ne"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Ano (jen pro tentokrát)"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Ano (a zakázat ho při každém startu)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "Povolit Vidalia spuštění Tor po ukončení stávajícího procesu Tor:"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/debian/0.2.x/po/da.po b/debian/0.2.x/po/da.po
index 7b02d42..0bd2987 100644
--- a/debian/0.2.x/po/da.po
+++ b/debian/0.2.x/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-09-25 17:30+01:00\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
@@ -16,153 +16,48 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr "Om interaktionen mellem Vidalia og Tor"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-"Vidalia tilbyder en grafisk grænseflade til Tor. Dette betyder at Vidalia "
-"har brug for at snakke med Tor for at kunne konfigurere forskellige aspekter "
-"af netværket Tor, se dets status på et øjeblik, overvåg dets brug af båndbredde "
-"eller bare se logfiler."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-"Komponenten på Torprogrammet, som Vidalia snakker med, er en dæmonproces, "
-"som arbejder i baggrunden uden krav om nogen brugerhandlinger."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr "Der er to forskellige måder at lade Vidalia kommunikere med Tor:"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-"- Lade Vidalia starte en proces i Tor på egen hånd.\n"
-" (Det nemmeste for slutbrugere, kan ikke bruges på et skrivebord med "
-"flere brugere)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-"- Lad Tor bruge en kontrolport til at kommunikere med Vidalia.\n"
-" (Anbefales for bedre sikkerhed, forhindrer angreb via "
-"privilegieeskalering)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-"Læs venligst '/usr/share/doc/vidalia/README.Debian' For yderligere information."
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Nej"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Ja (for nu)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Ja (og deaktiver den for alle opstarter)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "Lad Vidalia starte Tor efter at have standset eksisterende Tor-proces?"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"Vidalias installation fandt en en kørende proces i Tor. For at Vidalia kan "
-"fungere, skal der vælges mellem tre forskellige måder at starte processen i "
-"Tor på:"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
-"Hvis du vælger 'Nej', vil Vidalia forudsætte, at en proces i Tor altid vil "
-"køre, hvilket er standardopførelsen (anbefalet for et skrivebord med flere "
-"brugere)"
-# inmediatelly -> immediately
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
-"Hvis du vælger 'Ja (for nu)', vil Vidalia øjeblikkelig stoppe processen i "
-"Tor, så Vidalia kan starte processen denne gang, og vil derefter antage, at "
-"Tor altid vil køre ved de næste genstarter"
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
-"Hvis du vælger 'Ja (og deaktiver den for alle opstarter)', vil Vidalia konfigurere "
-"Tor til ikke at starte på egen hånd ved hver opstart og tillade, at Tor bliver "
-"startet af Vidalia (anbefales for slutbrugere)"
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Hvis du er i tvivl, så vælg standardsvaret. (Du vil altid kunne ændre det ved "
-"at køre 'dpkg-reconfigure vidalia')"
-
diff --git a/debian/0.2.x/po/de.po b/debian/0.2.x/po/de.po
index de6ce93..6b460ee 100644
--- a/debian/0.2.x/po/de.po
+++ b/debian/0.2.x/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.8-1\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-05-09 19:08+0200\n"
"Last-Translator: Martin Eberhard Schauer <Martin.E.Schauer at gmx.de>\n"
"Language-Team: de <debian-l10n-german at lists.debian.org>\n"
@@ -16,125 +16,48 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Nein"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Ja (nur dieses Mal)"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Ja (und für alle weiteren Systemstarts deaktivieren)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "Den laufenden Tor-Prozess durch Vidalia beenden und Tor neu starten:"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/debian/0.2.x/po/es.po b/debian/0.2.x/po/es.po
index 068e16f..bf9b06b 100644
--- a/debian/0.2.x/po/es.po
+++ b/debian/0.2.x/po/es.po
@@ -28,7 +28,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.7-4\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-05-03 10:10+0200\n"
"Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -37,126 +37,48 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "No"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Sí (sólo por ahora)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Sí (y desactivarlo en cada arranque)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"Permitir que Vidalia comience Tor después de parar el proceso Tor existente:"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/debian/0.2.x/po/fi.po b/debian/0.2.x/po/fi.po
index 6a182df..27a37bc 100644
--- a/debian/0.2.x/po/fi.po
+++ b/debian/0.2.x/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: \n"
"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -17,123 +17,47 @@ msgstr ""
"X-Poedit-Language: Finnish\n"
"X-Poedit-Country: FINLAND\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "No"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
diff --git a/debian/0.2.x/po/fr.po b/debian/0.2.x/po/fr.po
index dd86976..3a47a3d 100644
--- a/debian/0.2.x/po/fr.po
+++ b/debian/0.2.x/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-04-30 19:12+0200\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: fr <debian-l10n-french at lists.debian.org>\n"
@@ -18,127 +18,48 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Non"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Oui (uniquement cette fois)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Oui (et pour tous les redémarrages à venir)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"Déléguer le lancement de Tor à Vidalia après arrêt des processus Tor "
-"existants :"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/debian/0.2.x/po/it.po b/debian/0.2.x/po/it.po
index f931ef2..dadbef4 100644
--- a/debian/0.2.x/po/it.po
+++ b/debian/0.2.x/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.10-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-09-25 19:42+0200\n"
"Last-Translator: Vincenzo Campanella <vinz65 at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -16,158 +16,48 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr "Informazioni sull'interazione fra Vidalia e Tor"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-"Vidalia fornisce un'interfaccia utente (GUI) per il software Tor. Questo "
-"significa che Vidalia necessita di dialogare con Tor onde configurarne diversi "
-"aspetti della rete, visualizzarne lo stato in un colpo d'occhio, monitorarne "
-"l'uso di banda o semplicemente visualizzarne i registri."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-"Il componente di Tor con cui Vidalia dialoga è un processo demone, il quale "
-"lavora in background senza che sia richiesta alcuna interazione con l'utente."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr "Vidalia può comunicare con Tor in due modi diversi:"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-"- lasciare che Vidalia avvii il processo di Tor\n"
-" È il sistema più semplice per l'utente finale, ma non può essere "
-"utilizzato in un ambiente multiutente."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-"- Abilitare Tor per l'utilizzo di una porta tramite cui comunicare con "
-"Vidalia.\n"
-" È il modo raccomandato per una maggiore sicurezza, che previene eventuali "
-"attacchi di scalo di privilegi."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-"Per maggiori informazioni consultare la documentazione in «/usr/share/doc/"
-"vidalia/README.Debian»."
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "No"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Sì (solo per ora)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Sì (e disabilitalo per ogni avvio)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr ""
-"Lasciare che Vidalia avvii Tor dopo aver arrestato il processo di Tor "
-"attualmente in esecuzione?"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"L'installazione di Vidalia ha trovato un processo di Tor in esecuzione. "
-"Affinché Vidalia possa funzionare è necessario scegliere fra tre differenti "
-"modi di avviare il processo di Tor:"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
-"Se si sceglie «No», Vidalia assumerà che il processo di Tor sia sempre in "
-"esecuzione, ciò che corrisponde al comportamento predefinito del pacchetto "
-"(raccomandato per un ambiente multiutente)"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
-"Se si sceglie «Sì (solo per ora)», Vidalia arresterà immediatamente il "
-"processo di Tor, in modo che Vidalia possa avviare il processo di Tor per "
-"questa volta, mentre ai prossimi riavvii presumerà che Tor sia sempre in "
-"esecuzione"
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
-"Se si sceglie «Sì (e disabilitalo per ogni avvio)», Vidalia configurerà Tor "
-"in modo che non venga eseguito all'avvio e abiliterà la sua esecuzione "
-"tramite Vidalia (raccomandato per gli utenti finali)"
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"In caso di dubbio, lasciare la risposta predefinita. Sarà possibile "
-"modificare questa configurazione in ogni momento, eseguendo «dpkg-reconfigure "
-"vidalia»."
diff --git a/debian/0.2.x/po/pt.po b/debian/0.2.x/po/pt.po
index 5dce72c..8256168 100644
--- a/debian/0.2.x/po/pt.po
+++ b/debian/0.2.x/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.7-4\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-04-30 17:42+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro at netcabo.pt>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -18,125 +18,48 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Não"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Sim (apenas desta vez)"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Sim (e desactivá-lo em todos os arranques)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "Deixar o Vidalia arrancar o Tor após parar o processo Tor existente:"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/debian/0.2.x/po/ru.po b/debian/0.2.x/po/ru.po
index 48322bf..5035c81 100644
--- a/debian/0.2.x/po/ru.po
+++ b/debian/0.2.x/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.7-4\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-05-01 10:33+0400\n"
"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -20,126 +20,48 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Нет"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Да (прямо сейчас)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Да (и отключить запуск при загрузке машины)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"Позволить Vidalia запустить Tor после остановки существующего процесса Tor:"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/debian/0.2.x/po/sv.po b/debian/0.2.x/po/sv.po
index 2022766..fe8aa06 100644
--- a/debian/0.2.x/po/sv.po
+++ b/debian/0.2.x/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-05-03 22:11+0100\n"
"Last-Translator: Martin Bagge <brother at bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -19,125 +19,48 @@ msgstr ""
"X-Poedit-Language: Swedish\n"
"X-Poedit-Country: Sweden\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Nej"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Ja (den här gången)"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Ja (och avaktivera det vid uppstarten av system)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "Låt Vidalia starta Tor när en existerande Tor-process stannar:"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/debian/0.2.x/po/templates.pot b/debian/0.2.x/po/templates.pot
index e937d6c..4ef8eb1 100644
--- a/debian/0.2.x/po/templates.pot
+++ b/debian/0.2.x/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,123 +17,47 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "No"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
diff --git a/debian/0.2.x/po/vi.po b/debian/0.2.x/po/vi.po
index c88ad32..11bfba8 100644
--- a/debian/0.2.x/po/vi.po
+++ b/debian/0.2.x/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.7-4\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-05-13 22:44+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -17,126 +17,48 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.8\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Không"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Có (chỉ vào lúc này)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Có (và tắt nó cho mỗi lần khởi động)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"Cho phép Vidalia khởi chạy Tor sau khi dừng chạy tiến trình Tor đã có :"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/debian/0.2.x/po/zh_CN.po b/debian/0.2.x/po/zh_CN.po
index 7cc210a..f499ca0 100644
--- a/debian/0.2.x/po/zh_CN.po
+++ b/debian/0.2.x/po/zh_CN.po
@@ -4,8 +4,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Vidalia 0.2.10\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
-"PO-Revision-Date: 2010-09-26 17:22+0800\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
+"PO-Revision-Date: 2010-09-26 17:37+0800\n"
"Last-Translator: Vern Sun <s5unty at gmail.com>\n"
"Language-Team: Chinese <debian-l10n-chinese at lists.debian.org>\n"
"Language: \n"
@@ -13,146 +13,48 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr "关于 Vidalia 和 Tor 程序的交互"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-"Vidalia 提供 Tor 程序一个前端图形化界面。这意味着 Vidalia 在下列方面需要和 "
-"Tor 程序产生交互：配置网络参数，查看当前状态，监听带宽用量，查看日志信息等。"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-"Tor 程序中用于和 Vidalia 交互的组件，是一个工作在后台的不会被任何用户干扰的守"
-"护进程。"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr "已知的两种让 Vidalia 和 Tor 通信的方式："
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-"- 让 Vidalia 接管并负责 Tor 程序的启动。\n"
-" (最简单，只有这个系统长期都是您一个人使用的情况下才请选择该项)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-"- 只允许 Tor 通过一个控制端口和 Vidalia 通信。\n"
-" (更安全，适用于系统存在多用户使用的情况，防止基于权限提升的攻击行为)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr "更多信息请查看 '/usr/share/doc/vidalia/README.Debian'。"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "不"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "是 (暂时接管)"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "是 (长期接管)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "停止正在运行的 Tor 程序，并让 Vidalia 接管并负责启动 Tor 吗？"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
-"Vidalia 的设置程序检测到 Tor 程序当前正在运行。为了 Vidalia 能够正常的工作，"
-"请您在下列选项中选择一种接管 Tor 程序的方式："
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
-"如果您选择 ‘不’，Vidalia 将会假定 Tor 程序始终在后台运行 (适用于多用户使用的"
-"系统)"
#. Type: select
#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid ""
-#| "If you choose 'Yes (just for now)', Vidalia will immediatelly stop the "
-#| "Tor process, so Vidalia could start Tor process this time, and will "
-#| "assume that Tor will be always running in next reboots"
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
-"如果您选择 ‘是 (暂时接管)’，当前正在运行的 Tor 程序立即被中止，在此之后直到系"
-"统重启之前，Tor 程序会随 Vidalia 一起启动"
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"如果您选择 ‘是 (长期接管)’，Vidalia 会停止当前正在运行的 Tor 程序，并且禁止 "
-"Tor 程序开机自动启动，允许由 Vidalia 启动 (适用于单用户使用的系统)"
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
-"如果您不能肯定，请保留默认选项。(以后随时运行 'dpkg-reconfigure vidalia' 可以"
-"重新选择)"
diff --git a/debian/0.2.x/po/zh_TW.po b/debian/0.2.x/po/zh_TW.po
index 1c94eb0..0fbaf98 100644
--- a/debian/0.2.x/po/zh_TW.po
+++ b/debian/0.2.x/po/zh_TW.po
@@ -4,8 +4,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Vidalia 0.2.10\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
-"PO-Revision-Date: 2010-09-26 17:23+0800\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
+"PO-Revision-Date: 2010-09-26 17:37+0800\n"
"Last-Translator: Vern Sun <s5unty at gmail.com>\n"
"Language-Team: Chinese <debian-l10n-chinese at lists.debian.org>\n"
"Language: \n"
@@ -13,146 +13,49 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr "關於 Vidalia 和 Tor 程序的交互"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-"Vidalia 提供 Tor 程序一個前端圖形化界面。這意味着 Vidalia 在下列方面需要和 "
-"Tor 程序產生交互：配置網絡參數，查看當前狀態，監聽頻寬用量，查看日誌信息等。"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-"Tor 程序中用於和 Vidalia 交互的組件，是一個工作在後台的不會被任何用戶干擾的守"
-"護進程。"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr "已知的兩種讓 Vidalia 和 Tor 通信的方式："
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-"- 讓 Vidalia 接管並負責 Tor 程序的啟動。\n"
-" (最簡單，只有這個系統長期都是您一個人使用的情況下才請選擇該項)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-"- 只允許 Tor 通過一個控制連接埠和 Vidalia 通信。\n"
-" (更安全，適用於系統存在多用戶使用的情況，防止基于權限提升的攻擊行為)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr "更多信息請查看 '/usr/share/doc/vidalia/README.Debian'。"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "不"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "是 (暫時接管)"
+#: ../templates:1001
+msgid "One-off restart"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "是 (長期接管)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "停止正在運行的 Tor 程序，並讓 Vidalia 接管並負責啟動 Tor 嗎？"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
-"Vidalia 的設置程序檢測到 Tor 程序當前正在運行。為了 Vidalia 能夠正常的工作，"
-"請您在下列選項中選擇一種接管 Tor 程序的方式："
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
-"如果您選擇 ‘不’，Vidalia 將會假定 Tor 程序始終在後台運行 (適用於多用戶使用的"
-"系統)"
#. Type: select
#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid ""
-#| "If you choose 'Yes (just for now)', Vidalia will immediatelly stop the "
-#| "Tor process, so Vidalia could start Tor process this time, and will "
-#| "assume that Tor will be always running in next reboots"
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"如果您選擇 ‘是 (暫時接管)’，當前正在運行的 Tor 程序立即被中止，在此之後直到系"
-"統重啟之前，Tor 程序會隨 Vidalia 一起啟動"
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
-msgstr ""
-"如果您選擇 ‘是 (長期接管)’，Vidalia 會停止當前正在運行的 Tor 程序，並且禁止 "
-"Tor 程序開機自動啟動，允許由 Vidalia 啟動 (適用於單用戶使用的系統)"
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
-"如果您不能肯定，請保留預設選項。(以後隨時運行 'dpkg-reconfigure vidalia' 可以"
-"重新選擇)"
diff --git a/debian/0.2.x/templates b/debian/0.2.x/templates
index 86ae389..6e9b47a 100644
--- a/debian/0.2.x/templates
+++ b/debian/0.2.x/templates
@@ -1,52 +1,21 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: vidalia/info
-Type: note
-_Description: About Vidalia and the Tor software interaction
- Vidalia provides a GUI for the Tor software. That means that Vidalia needs to
- talk to the Tor software for configuring different aspects of the Tor Network,
- view its status at a glance, monitor its bandwidth usage or just view logs.
- .
- The component of the Tor software that Vidalia talks to is a daemon process,
- which works on background without any user interaction required.
- .
- There are two different ways to let Vidalia communicate with Tor:
- .
- - Letting Vidalia start Tor process on its own.
- (Simplest for end users, can't be used in a multi-user desktop)
- .
- - Enable Tor to use a control port to communicate with Vidalia.
- (Recommended for stronger security, preventing privilege escalation attacks)
- .
- For more information please read '/usr/share/doc/vidalia/README.Debian'.
-
Template: vidalia/tor-daemon-interaction
Type: select
-Choices-C: no, yes-now, yes-always
-__Choices: No, Yes (just for now), Yes (and disable it for every boot)
-Default: yes-always
-_Description: Let Vidalia start Tor after stopping existing Tor process?
- Vidalia's installation found a Tor process running. In order for Vidalia to
- work, choose between these three different ways of starting the Tor process:
- .
- If you choose 'No', Vidalia will give for granted that Tor process will be
- always running, which is the default package behaviour
- (Recommended for a multi-user desktop)
- .
- If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor
- process, so Vidalia could start Tor process this time, and will assume that
- Tor will be always running in next reboots
- .
- If you choose 'Yes (and disable it for every boot)', Vidalia will configure
- the Tor software not to start by its own on every boot and allow it to be
- launched by Vidalia (Recommended for end users)
- .
- In doubt, leave default answer selected.
- (Will be able to change it at any time by running 'dpkg-reconfigure vidalia')
+Choices-C: nothing, one-off, permanent
+__Choices: No Configuration, One-off restart, Permanent takeover
+Default: permanent
+_Description: Tor/Vidalia interaction:
+ Vidalia needs to communicate with the running Tor daemon so that it
+ can provide a graphical user interface for it. This requires either
+ the manual reconfiguration of Tor to allow secure authentication
+ (recommended) or a restart of Tor under Vidalia's control.
+ * No configuration:
+ leave Tor running for now. Vidalia will not be able to
+ communicate with Tor until it is manually reconfigured - see
+ "/usr/share/doc/vidalia/README.Debian" for more details;
+ * One-off restart:
+ stop Tor now so Vidalia can start it, just this once - Tor will
+ start by itself on reboots, so manual configuration will still
+ be required;
+ * Permanent takeover:
+ stop Tor and simply let Vidalia handle starting it whenever you
+ run Vidalia (not usable on a multi-user system).
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/README.Debian b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/README.Debian
index 1754d24..ea168c1 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/README.Debian
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/README.Debian
@@ -1,43 +1,128 @@
Vidalia for Debian
------------------
-There are currently two ways of communication supported between
-Tor daemon (carried with 'tor' package), and Vidalia interface:
+ For the anxious and patienceless people
+ ---------------------------------------
+
+3 different ways of running Vidalia:
+
+1. Re/Configure Vidalia not to let Tor to start and simply start Vidalia.
+2. Enable CookieAuthentication at tor's config, and grab
+ /var/lib/tor/control_auth_cookie (RECOMMENDED for strength security)
+3. Enable ControlPort and use HashedControlPassword got from
+ 'tor --hash-password'.
+
+
+
+
+ Full and complete explanation
+ -----------------------------
+
+
+Vidalia provides a GUI for the Tor software.
+That means that Vidalia needs to talk to the Tor software for configuring
+different aspects of the Tor Network, view its status at a glance,
+monitor its bandwidth usage, or just view logs between others
+
+The component of the Tor software that Vidalia talks to is a daemon process,
+which works on background without any user interaction required.
+
+Vidalia support three different ways of talking to Tor:
+
+
1. Letting Vidalia start Tor process on its own.
---------------------------------------------
- This is default option on debconf while configuring vidalia package
- (easy reconfigurable by running 'dpkg-reconfigure vidalia').
+ ------> "I want it, and I want it NOW!"
+
+ This option is the simplest for end users.
+
+ This is default option on debconf while configuring vidalia package, handled
+ in the debconf front-end to Vidalia, easily reconfigurable by running
+ 'dpkg-reconfigure vidalia' at any given time.
+
+
+ *********************** FOR PARANOIDS ONLY ***************************
+ | |
+ | |
+ | In the remote and unlikely event of existing a bug on the |
+ | Tor routing algorithm or implementation itself, it might |
+ | _relatively_ easy, or unless possible, for a remote user to |
+ | access to the user's launching Vidalia information, |
+ | known as "privilege escalation attacks". |
+ | |
+ | |
+ | This will be much more difficult if you run Vidalia on any |
+ | of the next two alternatives described below. |
+ | |
+ | |
+ | ** Please consider using them if possible!!!! ** |
+ | |
+ | |
+ *********************** FOR PARANOIDS ONLY ***************************
+
+
+
+2. Enable Tor to use CookieAuthentication to communicate with Vidalia.
+ -------------------------------------------------------------------
- This is now handled in the debconf front-end to Vidalia. If you decide you no
- longer wish to have Vidalia control Tor, and want to re-enable Tor's ability to
- start when your machine boots, dpkg-reconfigure vidalia and choose 'no'.
+ * The better password is the one you don't have to know about *
-2. Enable Tor to use a control port to communicate with Vidalia.
+ This method consists in a password-less authentication. This means
+ you wont have to remember any password, but you'll have to grab a
+ very important and *SECRET* file from your disc, called "Auth Cookie".
+
+ To enable this profile, edit Tor configuration file, by default at
+ '/etc/tor/torrc', add or uncomment the 'CookieAuthentication' value
+ and setting it to 1.
+ You will end up having something like this:
+
+# grep Cookie /etc/tor/torrc
+CookieAuthentication 1
+
+ Now start/restart Tor daemon and start Vidalia from your regular X user.
+ Vidalia will ask you for a "cookie file" at the next run:
+
+ ------------------------------------------------------------------------
+ You will have to fetch the "cookie file" from your local filesystem,
+ by default at '/var/lib/tor/control_auth_cookie'
+
+ DO NOT share this file to anyone, Tor rests on it!
+ ------------------------------------------------------------------------
+
+ This option might be simpler than all the others, but will require you
+ to grab a different cookie file every time you restart the Tor process,
+ on contrast to the next methods.
+
+ This is my prefer and recommended method, simple and easy, no passwords.
+
+
+
+3. Enable Tor to use a control port to communicate with Vidalia.
-------------------------------------------------------------
- This can be easily done by editing Tor configuration file, by default
- '/etc/tor/torrc', adding or uncommenting the 'ControlPort=9051' option,
- and adding the proper value to 'HashedControlPassword', as shown below:
+ Edit Tor configuration file, by default '/etc/tor/torrc', add or
+ uncomment the 'ControlPort 9051' option, and adding the output
+ you get from tor to 'HashedControlPassword', as shown here:
- # tor --hash-password SOME_PASSWORD_HERE
- Sep 17 18:48:49.421 [notice] Tor v0.2.0.30 (r15956). This is experimental
- software. Do not rely on it for strong anonymity. (Running on Linux x86_64)
+# tor --hash-password SOME_PASSWORD_HERE
+Sep 17 18:48:49.421 [notice] Tor v0.2.0.30 (r15956). This is experimental
+software. Do not rely on it for strong anonymity. (Running on Linux x86_64)
16:167F667A98F859D2600BD708B48B95343FEF7800B479E2AA4284ACF029
- You will have to have something like this:
- # grep Control /etc/tor/torrc
- ControlPort 9051
- HashedControlPassword 16:167F667A98F859D2600BD708B48B95343FEF7800B479E2AA4284ACF029
+ You will end having something like this:
+
+# grep Control /etc/tor/torrc
+ControlPort 9051
+HashedControlPassword 16:167F667A98F...4ACF029
- Then start/restart Tor daemon and then run Vidalia GUI.
- It will ask Tor what auth modes it accepts and if everything is OK,
- You will be asked for the password, in the example, 'SOME_PASSWORD_HERE'
- (as you pass it with --hash-password, not the hash).
+ Now start/restart Tor daemon and start Vidalia from your regular X user.
+ Vidalia will ask you for that password at the next run, in the example,
+ 'SOME_PASSWORD_HERE' (as the phrase you pass it with --hash-password,
+ not the hash), an will start a secure authentication. That's all!
- -- Ulises Vitulli <uvitulli at fi.uba.ar> Wed, 17 Sep 2008 17:24:06 -0300
- (Updated by Erinn Clark <erinn at torproject.org> Sun, 04 Apr 2010 20:16:07 -0700)
+ -- Ulises Vitulli <dererk at debian.org> Fri, 24 Sep 2010 11:18:20 -0300
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/config b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/config
index 3b882fe..dc061e5 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/config
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/config
@@ -5,12 +5,9 @@ if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
fi
-
seen='false'
askuser() {
- info='vidalia/info'
question='vidalia/tor-daemon-interaction'
- db_input high $info || true
db_input high $question || true
db_go || true
db_get $question
@@ -24,18 +21,18 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
askuser
seen='true'
case "$RET" in
- (no)
+ (nothing)
if [ -f /etc/default/tor.vidalia ]; then
ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
fi
;;
- (yes-now)
+ (one-off)
invoke-rc.d --force tor stop
if [ -f /etc/default/tor.vidalia ]; then
ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
fi
;;
- (yes-always)
+ (permanent)
invoke-rc.d --force tor stop
ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-off /etc/default/tor.vidalia
;;
@@ -47,7 +44,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
# still running?? (e.g. chroot)
if [ "$seen" = "false" ]; then
askuser
- if [ "$RET" = "true" ]; then
+ if [ "$RET" = "nothing" ] || [ "$RET" = "one-off" ]; then
echo -n "Stopping tor daemon: "
pkill -x tor > /dev/null && echo "tor." || echo 'Failed!'
fi
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ca.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ca.po
index 4486aa9..b4b328f 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ca.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.9-1\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 19:11-0300\n"
"PO-Revision-Date: 2008-09-17 16:17-0300\n"
"Last-Translator: Ulises Vitulli <uvitulli at fi.uba.ar>\n"
"Language-Team: \n"
@@ -15,123 +15,62 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr ""
+#: ../templates:1001
+msgid "No Configuration"
+msgstr "Sense configuració"
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr ""
+#: ../templates:1001
+msgid "One-off restart"
+msgstr "Reinicia una vegada"
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr ""
+#: ../templates:1001
+msgid "Permanent takeover"
+msgstr "Control permanent"
#. Type: select
#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr ""
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
+msgstr "Interacció Tor/Vidalia"
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
+msgstr "Vidalia ho necessita per comunicar-se amb el dimoni que s'executa "
+"de manera que pot proporcionar una interfície d'usuari gràfica per ell. "
+" Açò necessita que es reconfigure manualment Tor per a que permeta una "
+"autentificació segura (el recomanat) o que es reinicie Tor amb el control"
+"de Vidalia.\n"
+" * Sense configuració:\n"
+" deixa Tor funcionant per ara. Vidalia no es podrà comunicar\n"
+" amb Tor fins que es reconfigure de forma manual - vegeu\n"
+" \"/usr/share/doc/vidalia/README.Debian\" per obtenir més detalls;\n"
+" * Reinicia una vegada:\n"
+" atura Tor ara de manera que Vidalia el puga engegar, tan sols esta\n"
+" vegada - Tor s'arrencarà automàticament en els reinicis, de manera\n"
+" que la configuració manual encara farà falta\n"
+" * Control permanent:\n"
+" atura Tor i permet simplement a Vidalia controlar que s'engegarà quan\n"
+" s'executa Vidalia (no es pot utilitzar en sistemes multiusuari)."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/cs.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/cs.po
index a636597..f20e808 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/cs.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.1.13-3\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-04-30 20:19+0200\n"
"Last-Translator: Martin Sin <martin.sin at zshk.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -14,125 +14,48 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Ne"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Ano (jen pro tentokrát)"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Ano (a zakázat ho při každém startu)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "Povolit Vidalia spuštění Tor po ukončení stávajícího procesu Tor:"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/da.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/da.po
index 7b02d42..0bd2987 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/da.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-09-25 17:30+01:00\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
@@ -16,153 +16,48 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr "Om interaktionen mellem Vidalia og Tor"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-"Vidalia tilbyder en grafisk grænseflade til Tor. Dette betyder at Vidalia "
-"har brug for at snakke med Tor for at kunne konfigurere forskellige aspekter "
-"af netværket Tor, se dets status på et øjeblik, overvåg dets brug af båndbredde "
-"eller bare se logfiler."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-"Komponenten på Torprogrammet, som Vidalia snakker med, er en dæmonproces, "
-"som arbejder i baggrunden uden krav om nogen brugerhandlinger."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr "Der er to forskellige måder at lade Vidalia kommunikere med Tor:"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-"- Lade Vidalia starte en proces i Tor på egen hånd.\n"
-" (Det nemmeste for slutbrugere, kan ikke bruges på et skrivebord med "
-"flere brugere)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-"- Lad Tor bruge en kontrolport til at kommunikere med Vidalia.\n"
-" (Anbefales for bedre sikkerhed, forhindrer angreb via "
-"privilegieeskalering)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-"Læs venligst '/usr/share/doc/vidalia/README.Debian' For yderligere information."
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Nej"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Ja (for nu)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Ja (og deaktiver den for alle opstarter)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "Lad Vidalia starte Tor efter at have standset eksisterende Tor-proces?"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"Vidalias installation fandt en en kørende proces i Tor. For at Vidalia kan "
-"fungere, skal der vælges mellem tre forskellige måder at starte processen i "
-"Tor på:"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
-"Hvis du vælger 'Nej', vil Vidalia forudsætte, at en proces i Tor altid vil "
-"køre, hvilket er standardopførelsen (anbefalet for et skrivebord med flere "
-"brugere)"
-# inmediatelly -> immediately
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
-"Hvis du vælger 'Ja (for nu)', vil Vidalia øjeblikkelig stoppe processen i "
-"Tor, så Vidalia kan starte processen denne gang, og vil derefter antage, at "
-"Tor altid vil køre ved de næste genstarter"
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
-"Hvis du vælger 'Ja (og deaktiver den for alle opstarter)', vil Vidalia konfigurere "
-"Tor til ikke at starte på egen hånd ved hver opstart og tillade, at Tor bliver "
-"startet af Vidalia (anbefales for slutbrugere)"
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Hvis du er i tvivl, så vælg standardsvaret. (Du vil altid kunne ændre det ved "
-"at køre 'dpkg-reconfigure vidalia')"
-
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/de.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/de.po
index de6ce93..6b460ee 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/de.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.8-1\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-05-09 19:08+0200\n"
"Last-Translator: Martin Eberhard Schauer <Martin.E.Schauer at gmx.de>\n"
"Language-Team: de <debian-l10n-german at lists.debian.org>\n"
@@ -16,125 +16,48 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Nein"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Ja (nur dieses Mal)"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Ja (und für alle weiteren Systemstarts deaktivieren)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "Den laufenden Tor-Prozess durch Vidalia beenden und Tor neu starten:"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/es.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/es.po
index 068e16f..bf9b06b 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/es.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/es.po
@@ -28,7 +28,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.7-4\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-05-03 10:10+0200\n"
"Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -37,126 +37,48 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "No"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Sí (sólo por ahora)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Sí (y desactivarlo en cada arranque)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"Permitir que Vidalia comience Tor después de parar el proceso Tor existente:"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fi.po
index 6a182df..27a37bc 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fi.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: \n"
"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -17,123 +17,47 @@ msgstr ""
"X-Poedit-Language: Finnish\n"
"X-Poedit-Country: FINLAND\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "No"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fr.po
index dd86976..3a47a3d 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fr.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-04-30 19:12+0200\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: fr <debian-l10n-french at lists.debian.org>\n"
@@ -18,127 +18,48 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Non"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Oui (uniquement cette fois)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Oui (et pour tous les redémarrages à venir)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"Déléguer le lancement de Tor à Vidalia après arrêt des processus Tor "
-"existants :"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/it.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/it.po
index f931ef2..dadbef4 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/it.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.10-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-09-25 19:42+0200\n"
"Last-Translator: Vincenzo Campanella <vinz65 at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -16,158 +16,48 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr "Informazioni sull'interazione fra Vidalia e Tor"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-"Vidalia fornisce un'interfaccia utente (GUI) per il software Tor. Questo "
-"significa che Vidalia necessita di dialogare con Tor onde configurarne diversi "
-"aspetti della rete, visualizzarne lo stato in un colpo d'occhio, monitorarne "
-"l'uso di banda o semplicemente visualizzarne i registri."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-"Il componente di Tor con cui Vidalia dialoga è un processo demone, il quale "
-"lavora in background senza che sia richiesta alcuna interazione con l'utente."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr "Vidalia può comunicare con Tor in due modi diversi:"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-"- lasciare che Vidalia avvii il processo di Tor\n"
-" È il sistema più semplice per l'utente finale, ma non può essere "
-"utilizzato in un ambiente multiutente."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-"- Abilitare Tor per l'utilizzo di una porta tramite cui comunicare con "
-"Vidalia.\n"
-" È il modo raccomandato per una maggiore sicurezza, che previene eventuali "
-"attacchi di scalo di privilegi."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-"Per maggiori informazioni consultare la documentazione in «/usr/share/doc/"
-"vidalia/README.Debian»."
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "No"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Sì (solo per ora)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Sì (e disabilitalo per ogni avvio)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr ""
-"Lasciare che Vidalia avvii Tor dopo aver arrestato il processo di Tor "
-"attualmente in esecuzione?"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"L'installazione di Vidalia ha trovato un processo di Tor in esecuzione. "
-"Affinché Vidalia possa funzionare è necessario scegliere fra tre differenti "
-"modi di avviare il processo di Tor:"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
-"Se si sceglie «No», Vidalia assumerà che il processo di Tor sia sempre in "
-"esecuzione, ciò che corrisponde al comportamento predefinito del pacchetto "
-"(raccomandato per un ambiente multiutente)"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
-"Se si sceglie «Sì (solo per ora)», Vidalia arresterà immediatamente il "
-"processo di Tor, in modo che Vidalia possa avviare il processo di Tor per "
-"questa volta, mentre ai prossimi riavvii presumerà che Tor sia sempre in "
-"esecuzione"
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
-"Se si sceglie «Sì (e disabilitalo per ogni avvio)», Vidalia configurerà Tor "
-"in modo che non venga eseguito all'avvio e abiliterà la sua esecuzione "
-"tramite Vidalia (raccomandato per gli utenti finali)"
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"In caso di dubbio, lasciare la risposta predefinita. Sarà possibile "
-"modificare questa configurazione in ogni momento, eseguendo «dpkg-reconfigure "
-"vidalia»."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/pt.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/pt.po
index 5dce72c..8256168 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/pt.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.7-4\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-04-30 17:42+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro at netcabo.pt>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -18,125 +18,48 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Não"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Sim (apenas desta vez)"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Sim (e desactivá-lo em todos os arranques)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "Deixar o Vidalia arrancar o Tor após parar o processo Tor existente:"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ru.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ru.po
index 48322bf..5035c81 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ru.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.7-4\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-05-01 10:33+0400\n"
"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -20,126 +20,48 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Нет"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Да (прямо сейчас)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Да (и отключить запуск при загрузке машины)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"Позволить Vidalia запустить Tor после остановки существующего процесса Tor:"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/sv.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/sv.po
index 2022766..fe8aa06 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/sv.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-05-03 22:11+0100\n"
"Last-Translator: Martin Bagge <brother at bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -19,125 +19,48 @@ msgstr ""
"X-Poedit-Language: Swedish\n"
"X-Poedit-Country: Sweden\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Nej"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Ja (den här gången)"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Ja (och avaktivera det vid uppstarten av system)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "Låt Vidalia starta Tor när en existerande Tor-process stannar:"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/templates.pot b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/templates.pot
index e937d6c..4ef8eb1 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/templates.pot
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,123 +17,47 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "No"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/vi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/vi.po
index c88ad32..11bfba8 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/vi.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.7-4\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-05-13 22:44+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -17,126 +17,48 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.8\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "Không"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "Có (chỉ vào lúc này)"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "Có (và tắt nó cho mỗi lần khởi động)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
+#: ../templates:1001
+msgid "No Configuration"
msgstr ""
-"Cho phép Vidalia khởi chạy Tor sau khi dừng chạy tiến trình Tor đã có :"
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#. Choices
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_CN.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_CN.po
index 2320b55..f499ca0 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_CN.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_CN.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vidalia 0.2.10\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-09-26 17:37+0800\n"
"Last-Translator: Vern Sun <s5unty at gmail.com>\n"
"Language-Team: Chinese <debian-l10n-chinese at lists.debian.org>\n"
@@ -13,146 +13,48 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr "关于 Vidalia 和 Tor 程序的交互"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-"Vidalia 提供 Tor 程序一个前端图形化界面。这意味着 Vidalia 在下列方面需要和 "
-"Tor 程序产生交互：配置网络参数，查看当前状态，监听带宽用量，查看日志信息等。"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-"Tor 程序中用于和 Vidalia 交互的组件，是一个工作在后台的不会被任何用户干扰的守"
-"护进程。"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr "已知的两种让 Vidalia 和 Tor 通信的方式："
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-"- 让 Vidalia 接管并负责 Tor 程序的启动。\n"
-" (最简单，只有这个系统长期都是您一个人使用的情况下才请选择该项)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-"- 只允许 Tor 通过一个控制端口和 Vidalia 通信。\n"
-" (更安全，适用于系统存在多用户使用的情况，防止基于权限提升的攻击行为)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr "更多信息请查看 '/usr/share/doc/vidalia/README.Debian'。"
-
-#. Type: select
-#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "不"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "是 (暂时接管)"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "是 (长期接管)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "停止正在运行的 Tor 程序，并让 Vidalia 接管并负责启动 Tor 吗？"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "One-off restart"
msgstr ""
-"Vidalia 的设置程序检测到 Tor 程序当前正在运行。为了 Vidalia 能够正常的工作，"
-"请您在下列选项中选择一种接管 Tor 程序的方式："
#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#. Choices
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
-"如果您选择 ‘不’，Vidalia 将会假定 Tor 程序始终在后台运行 (适用于多用户使用的"
-"系统)"
#. Type: select
#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid ""
-#| "If you choose 'Yes (just for now)', Vidalia will immediatelly stop the "
-#| "Tor process, so Vidalia could start Tor process this time, and will "
-#| "assume that Tor will be always running in next reboots"
-msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
-"如果您选择 ‘是 (暂时接管)’，当前正在运行的 Tor 程序立即被中止，在此之后直到系"
-"统重启之前，Tor 程序会随 Vidalia 一起启动"
#. Type: select
#. Description
-#: ../templates:3002
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"如果您选择 ‘是 (长期接管)’，Vidalia 会停止当前正在运行的 Tor 程序，并且禁止 "
-"Tor 程序开机自动启动，允许由 Vidalia 启动 (适用于单用户使用的系统)"
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
-"如果您不能肯定，请保留默认选项。(以后随时运行 'dpkg-reconfigure vidalia' 可以"
-"重新选择)"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_TW.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_TW.po
index 9f533dc..0fbaf98 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_TW.po
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_TW.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vidalia 0.2.10\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-24 14:01-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-09-26 17:37+0800\n"
"Last-Translator: Vern Sun <s5unty at gmail.com>\n"
"Language-Team: Chinese <debian-l10n-chinese at lists.debian.org>\n"
@@ -13,146 +13,49 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "About Vidalia and the Tor software interaction"
-msgstr "關於 Vidalia 和 Tor 程序的交互"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Vidalia provides a GUI for the Tor software. That means that Vidalia needs "
-"to talk to the Tor software for configuring different aspects of the Tor "
-"Network, view its status at a glance, monitor its bandwidth usage or just "
-"view logs."
-msgstr ""
-"Vidalia 提供 Tor 程序一個前端圖形化界面。這意味着 Vidalia 在下列方面需要和 "
-"Tor 程序產生交互：配置網絡參數，查看當前狀態，監聽頻寬用量，查看日誌信息等。"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"The component of the Tor software that Vidalia talks to is a daemon process, "
-"which works on background without any user interaction required."
-msgstr ""
-"Tor 程序中用於和 Vidalia 交互的組件，是一個工作在後台的不會被任何用戶干擾的守"
-"護進程。"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "There are two different ways to let Vidalia communicate with Tor:"
-msgstr "已知的兩種讓 Vidalia 和 Tor 通信的方式："
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Letting Vidalia start Tor process on its own.\n"
-" (Simplest for end users, can't be used in a multi-user desktop)"
-msgstr ""
-"- 讓 Vidalia 接管並負責 Tor 程序的啟動。\n"
-" (最簡單，只有這個系統長期都是您一個人使用的情況下才請選擇該項)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"- Enable Tor to use a control port to communicate with Vidalia.\n"
-" (Recommended for stronger security, preventing privilege escalation "
-"attacks)"
-msgstr ""
-"- 只允許 Tor 通過一個控制連接埠和 Vidalia 通信。\n"
-" (更安全，適用於系統存在多用戶使用的情況，防止基于權限提升的攻擊行為)"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"For more information please read '/usr/share/doc/vidalia/README.Debian'."
-msgstr "更多信息請查看 '/usr/share/doc/vidalia/README.Debian'。"
-
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "No"
-msgstr "不"
+#: ../templates:1001
+msgid "No Configuration"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (just for now)"
-msgstr "是 (暫時接管)"
+#: ../templates:1001
+msgid "One-off restart"
+msgstr ""
#. Type: select
#. Choices
-#: ../templates:3001
-msgid "Yes (and disable it for every boot)"
-msgstr "是 (長期接管)"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid "Let Vidalia start Tor after stopping existing Tor process?"
-msgstr "停止正在運行的 Tor 程序，並讓 Vidalia 接管並負責啟動 Tor 嗎？"
-
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"Vidalia's installation found a Tor process running. In order for Vidalia to "
-"work, choose between these three different ways of starting the Tor process:"
+#: ../templates:1001
+msgid "Permanent takeover"
msgstr ""
-"Vidalia 的設置程序檢測到 Tor 程序當前正在運行。為了 Vidalia 能夠正常的工作，"
-"請您在下列選項中選擇一種接管 Tor 程序的方式："
#. Type: select
#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'No', Vidalia will give for granted that Tor process will be "
-"always running, which is the default package behaviour (Recommended for a "
-"multi-user desktop)"
+#: ../templates:1002
+msgid "Tor/Vidalia interaction:"
msgstr ""
-"如果您選擇 ‘不’，Vidalia 將會假定 Tor 程序始終在後台運行 (適用於多用戶使用的"
-"系統)"
#. Type: select
#. Description
-#: ../templates:3002
-#, fuzzy
-#| msgid ""
-#| "If you choose 'Yes (just for now)', Vidalia will immediatelly stop the "
-#| "Tor process, so Vidalia could start Tor process this time, and will "
-#| "assume that Tor will be always running in next reboots"
+#: ../templates:1002
msgid ""
-"If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor "
-"process, so Vidalia could start Tor process this time, and will assume that "
-"Tor will be always running in next reboots"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
+" * No configuration:\n"
+" leave Tor running for now. Vidalia will not be able to\n"
+" communicate with Tor until it is manually reconfigured - see\n"
+" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
+" * One-off restart:\n"
+" stop Tor now so Vidalia can start it, just this once - Tor will\n"
+" start by itself on reboots, so manual configuration will still\n"
+" be required;\n"
+" * Permanent takeover:\n"
+" stop Tor and simply let Vidalia handle starting it whenever you\n"
+" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"如果您選擇 ‘是 (暫時接管)’，當前正在運行的 Tor 程序立即被中止，在此之後直到系"
-"統重啟之前，Tor 程序會隨 Vidalia 一起啟動"
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"If you choose 'Yes (and disable it for every boot)', Vidalia will configure "
-"the Tor software not to start by its own on every boot and allow it to be "
-"launched by Vidalia (Recommended for end users)"
-msgstr ""
-"如果您選擇 ‘是 (長期接管)’，Vidalia 會停止當前正在運行的 Tor 程序，並且禁止 "
-"Tor 程序開機自動啟動，允許由 Vidalia 啟動 (適用於單用戶使用的系統)"
-#. Type: select
-#. Description
-#: ../templates:3002
-msgid ""
-"In doubt, leave default answer selected. (Will be able to change it at any "
-"time by running 'dpkg-reconfigure vidalia')"
-msgstr ""
-"如果您不能肯定，請保留預設選項。(以後隨時運行 'dpkg-reconfigure vidalia' 可以"
-"重新選擇)"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/templates b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/templates
index 86ae389..6e9b47a 100644
--- a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/templates
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/templates
@@ -1,52 +1,21 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: vidalia/info
-Type: note
-_Description: About Vidalia and the Tor software interaction
- Vidalia provides a GUI for the Tor software. That means that Vidalia needs to
- talk to the Tor software for configuring different aspects of the Tor Network,
- view its status at a glance, monitor its bandwidth usage or just view logs.
- .
- The component of the Tor software that Vidalia talks to is a daemon process,
- which works on background without any user interaction required.
- .
- There are two different ways to let Vidalia communicate with Tor:
- .
- - Letting Vidalia start Tor process on its own.
- (Simplest for end users, can't be used in a multi-user desktop)
- .
- - Enable Tor to use a control port to communicate with Vidalia.
- (Recommended for stronger security, preventing privilege escalation attacks)
- .
- For more information please read '/usr/share/doc/vidalia/README.Debian'.
-
Template: vidalia/tor-daemon-interaction
Type: select
-Choices-C: no, yes-now, yes-always
-__Choices: No, Yes (just for now), Yes (and disable it for every boot)
-Default: yes-always
-_Description: Let Vidalia start Tor after stopping existing Tor process?
- Vidalia's installation found a Tor process running. In order for Vidalia to
- work, choose between these three different ways of starting the Tor process:
- .
- If you choose 'No', Vidalia will give for granted that Tor process will be
- always running, which is the default package behaviour
- (Recommended for a multi-user desktop)
- .
- If you choose 'Yes (just for now)', Vidalia will inmediatelly stop the Tor
- process, so Vidalia could start Tor process this time, and will assume that
- Tor will be always running in next reboots
- .
- If you choose 'Yes (and disable it for every boot)', Vidalia will configure
- the Tor software not to start by its own on every boot and allow it to be
- launched by Vidalia (Recommended for end users)
- .
- In doubt, leave default answer selected.
- (Will be able to change it at any time by running 'dpkg-reconfigure vidalia')
+Choices-C: nothing, one-off, permanent
+__Choices: No Configuration, One-off restart, Permanent takeover
+Default: permanent
+_Description: Tor/Vidalia interaction:
+ Vidalia needs to communicate with the running Tor daemon so that it
+ can provide a graphical user interface for it. This requires either
+ the manual reconfiguration of Tor to allow secure authentication
+ (recommended) or a restart of Tor under Vidalia's control.
+ * No configuration:
+ leave Tor running for now. Vidalia will not be able to
+ communicate with Tor until it is manually reconfigured - see
+ "/usr/share/doc/vidalia/README.Debian" for more details;
+ * One-off restart:
+ stop Tor now so Vidalia can start it, just this once - Tor will
+ start by itself on reboots, so manual configuration will still
+ be required;
+ * Permanent takeover:
+ stop Tor and simply let Vidalia handle starting it whenever you
+ run Vidalia (not usable on a multi-user system).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git
More information about the Pkg-privacy-commits
mailing list