[Pkg-privacy-commits] [vidalia] 28/160: Improved debconf templates, added new info template and bumped up standard-versions.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:13:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository vidalia.
commit aaaea04385f5730d2762dffe8dccb44788f6d9ea
Author: Dererk <dererk at madap.com.ar>
Date: Fri Sep 24 14:12:17 2010 -0300
Improved debconf templates, added new info template and bumped up standard-versions.
---
debian/0.2.x/README.Debian | 5 +-
debian/0.2.x/changelog | 8 +++
debian/0.2.x/config | 4 +-
debian/0.2.x/control | 4 +-
debian/0.2.x/po/ca.po | 134 +++++++++++++++++++++++++++++----------
debian/0.2.x/po/cs.po | 137 ++++++++++++++++++++++++++++++----------
debian/0.2.x/po/da.po | 113 ++++++++++++++++++++++++++++++---
debian/0.2.x/po/de.po | 113 ++++++++++++++++++++++++++++++---
debian/0.2.x/po/es.po | 113 ++++++++++++++++++++++++++++++---
debian/0.2.x/po/fi.po | 135 ++++++++++++++++++++++++++++++----------
debian/0.2.x/po/fr.po | 141 +++++++++++++++++++++++++++++++-----------
debian/0.2.x/po/it.po | 139 +++++++++++++++++++++++++++++++----------
debian/0.2.x/po/pt.po | 138 +++++++++++++++++++++++++++++++----------
debian/0.2.x/po/ru.po | 113 ++++++++++++++++++++++++++++++---
debian/0.2.x/po/sv.po | 139 +++++++++++++++++++++++++++++++----------
debian/0.2.x/po/templates.pot | 109 ++++++++++++++++++++++++++++++--
debian/0.2.x/po/vi.po | 113 ++++++++++++++++++++++++++++++---
debian/0.2.x/po/zh_CN.po | 134 ++++++++++++++++++++++++++++++---------
debian/0.2.x/po/zh_TW.po | 130 +++++++++++++++++++++++++++++---------
debian/0.2.x/postrm | 4 +-
debian/0.2.x/templates | 40 +++++++++++-
21 files changed, 1629 insertions(+), 337 deletions(-)
diff --git a/debian/0.2.x/README.Debian b/debian/0.2.x/README.Debian
index 1754d24..53dbbe1 100644
--- a/debian/0.2.x/README.Debian
+++ b/debian/0.2.x/README.Debian
@@ -4,6 +4,7 @@ Vidalia for Debian
There are currently two ways of communication supported between
Tor daemon (carried with 'tor' package), and Vidalia interface:
+
1. Letting Vidalia start Tor process on its own.
---------------------------------------------
@@ -14,6 +15,8 @@ Tor daemon (carried with 'tor' package), and Vidalia interface:
longer wish to have Vidalia control Tor, and want to re-enable Tor's ability to
start when your machine boots, dpkg-reconfigure vidalia and choose 'no'.
+
+
2. Enable Tor to use a control port to communicate with Vidalia.
-------------------------------------------------------------
@@ -39,5 +42,5 @@ Tor daemon (carried with 'tor' package), and Vidalia interface:
(as you pass it with --hash-password, not the hash).
- -- Ulises Vitulli <uvitulli at fi.uba.ar> Wed, 17 Sep 2008 17:24:06 -0300
+ -- 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)
diff --git a/debian/0.2.x/changelog b/debian/0.2.x/changelog
index 3715074..220f104 100644
--- a/debian/0.2.x/changelog
+++ b/debian/0.2.x/changelog
@@ -1,3 +1,11 @@
+vidalia (0.2.10-2) unstable; urgency=low
+
+ * Improved debconf templates interaction and set a default answer case
+ (Closes: #592773).
+ * Update Standard-version to 3.9.1 (no changes needed).
+
+ -- Ulises Vitulli <dererk at debian.org> Fri, 24 Sep 2010 11:18:20 -0300
+
vidalia (0.2.10-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/0.2.x/config b/debian/0.2.x/config
index 7504c7a..3b882fe 100644
--- a/debian/0.2.x/config
+++ b/debian/0.2.x/config
@@ -8,7 +8,9 @@ fi
seen='false'
askuser() {
- question='vidalia/info'
+ info='vidalia/info'
+ question='vidalia/tor-daemon-interaction'
+ db_input high $info || true
db_input high $question || true
db_go || true
db_get $question
diff --git a/debian/0.2.x/control b/debian/0.2.x/control
index 78e5ce4..485d23c 100644
--- a/debian/0.2.x/control
+++ b/debian/0.2.x/control
@@ -4,8 +4,10 @@ Priority: extra
Maintainer: Vern Sun <s5unty at gmail.com>
Uploaders: Ulises Vitulli <dererk at debian.org>, Erinn Clark <erinn at torproject.org>
Build-Depends: debhelper (>= 6.0.7~), autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://www.vidalia-project.net
+Vcs-Git: git://git.debian.org/collab-maint/vidalia.git/
+Vcs-Browser: http://git.debian.org/?p=collab-maint/vidalia.git
Package: vidalia
Architecture: any
diff --git a/debian/0.2.x/po/ca.po b/debian/0.2.x/po/ca.po
index 721b6bc..4486aa9 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-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,53 +15,123 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
+#. 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 "Let Vidalia start Tor after stopping existing Tor process:"
+msgid ""
+"For more information please read '/usr/share/doc/vidalia/README.Debian'."
msgstr ""
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "No"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (and disable it for every boot)"
msgstr ""
-#~ msgid ""
-#~ "Do you want to stop the existing Tor process and let Vidalia start Tor?"
-#~ msgstr ""
-#~ "Voleu parar l'actual execució de Tor i permetre que Vidalia engegue Tor?"
-
-#~ msgid ""
-#~ "It looks like there is a Tor process already running. If you want to "
-#~ "start Tor using Vidalia, you might have to stop the existing Tor process. "
-#~ "Otherwise you will have to enable 'ControlPort' option into Tor as "
-#~ "explained in the documentation carried with this package ('/usr/share/"
-#~ "doc/vidalia/README.Debian')."
-#~ msgstr ""
-#~ "Pareix que encara està en marxa el Tor. Si voleu engegar Tor amb el "
-#~ "Vidalia,hauríeu de detindre el procés de Tor què està en execució.Si no, "
-#~ "haureu d'engegar l'opció «ControlPort» a Tor,tal com s'explica a la "
-#~ "documentació que suministra aquest paquet(/usr/share/doc/vidalia/README."
-#~ "Debian)"
-
-#~ msgid ""
-#~ "Note that if you choose to let Vidalia start Tor, you will have to "
-#~ "manually disable Tor starting automatically on every reboot (See 'README."
-#~ "Debian')."
-#~ msgstr ""
-#~ "Adoneu-vos que si trieu que Vidalia engegue Tor, haureu de deshabilitar "
-#~ "de forma manual l'engegat de Tor automàtic a cada reinici (Vegeu «README."
-#~ "Debian»)."
+#. 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:"
+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 ""
diff --git a/debian/0.2.x/po/cs.po b/debian/0.2.x/po/cs.po
index f06ffc3..a636597 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-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,52 +14,125 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
+#. Type: note
#. Description
#: ../templates:2001
-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:"
+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:2002
+#: ../templates:3001
msgid "No"
msgstr "Ne"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr "Ano (jen pro tentokrát)"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (and disable it for every boot)"
msgstr "Ano (a zakázat ho při každém startu)"
-#~ msgid ""
-#~ "Do you want to stop the existing Tor process and let Vidalia start Tor?"
-#~ msgstr ""
-#~ "Přejete si ukončit stávající proces Tor a spustit ho pomocí Vidalia?"
-
-#~ msgid ""
-#~ "It looks like there is a Tor process already running. If you want to "
-#~ "start Tor using Vidalia, you might have to stop the existing Tor process. "
-#~ "Otherwise you will have to enable 'ControlPort' option into Tor as "
-#~ "explained in the documentation carried with this package ('/usr/share/"
-#~ "doc/vidalia/README.Debian')."
-#~ msgstr ""
-#~ "Vypadá to, že proces Tor už běží. Pokud chcete začít používat Vidalia v "
-#~ "Tor, měli byste ukončit běžící proces. Jinak budete muset povolit volbu "
-#~ "'ControlPort' v Tor tak, jak je vysvětleno v dokumentaci tohoto balíčku "
-#~ "('/usr/share/doc/vidalia/README.Debian')."
-
-#~ msgid ""
-#~ "Note that if you choose to let Vidalia start Tor, you will have to "
-#~ "manually disable Tor starting automatically on every reboot (See 'README."
-#~ "Debian')."
-#~ msgstr ""
-#~ "Pamatujte, že jakmile umožníte Vidalia spustit Tor, budete muset ještě "
-#~ "ručně zakázat automatické spuštění při každém restartu počítače (viz. "
-#~ "'README.Debian')."
+#. 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:"
+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 ""
diff --git a/debian/0.2.x/po/da.po b/debian/0.2.x/po/da.po
index f77483c..fac8f73 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-0300\n"
"PO-Revision-Date: 2010-05-03 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,26 +16,125 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
+#. Type: note
#. Description
#: ../templates:2001
-msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgstr "Lad Vidalia starte Tor efter at have standset eksisterende Tor-proces:"
+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:2002
+#: ../templates:3001
msgid "No"
msgstr "Nej"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr "Ja (for nu)"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (and disable it for every boot)"
msgstr "Ja (og deaktiver den for alle opstarter)"
+
+#. 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 "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:"
+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 ""
diff --git a/debian/0.2.x/po/de.po b/debian/0.2.x/po/de.po
index aac4dc9..de6ce93 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-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,26 +16,125 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
+#. Type: note
#. Description
#: ../templates:2001
-msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgstr "Den laufenden Tor-Prozess durch Vidalia beenden und Tor neu starten:"
+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:2002
+#: ../templates:3001
msgid "No"
msgstr "Nein"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr "Ja (nur dieses Mal)"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../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:"
+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 ""
diff --git a/debian/0.2.x/po/es.po b/debian/0.2.x/po/es.po
index 2e55096..068e16f 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-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,27 +37,126 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
+#. Type: note
#. Description
#: ../templates:2001
-msgid "Let Vidalia start Tor after stopping existing Tor process:"
+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 ""
-"Permitir que Vidalia comience Tor después de parar el proceso Tor existente:"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "No"
msgstr "No"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr "Sí (sólo por ahora)"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../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?"
+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:"
+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 ""
diff --git a/debian/0.2.x/po/fi.po b/debian/0.2.x/po/fi.po
index 7229a46..6a182df 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-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,54 +17,123 @@ msgstr ""
"X-Poedit-Language: Finnish\n"
"X-Poedit-Country: FINLAND\n"
-#. Type: select
+#. 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 "Let Vidalia start Tor after stopping existing Tor process:"
+msgid ""
+"For more information please read '/usr/share/doc/vidalia/README.Debian'."
msgstr ""
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "No"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (and disable it for every boot)"
msgstr ""
-#~ msgid ""
-#~ "Do you want to stop the existing Tor process and let Vidalia start Tor?"
-#~ msgstr ""
-#~ "Tulisiko olemassa oleva Tor-prosessi keskeyttää ja käynnistää Tor "
-#~ "Vidalian avulla?"
-
-#~ msgid ""
-#~ "It looks like there is a Tor process already running. If you want to "
-#~ "start Tor using Vidalia, you might have to stop the existing Tor process. "
-#~ "Otherwise you will have to enable 'ControlPort' option into Tor as "
-#~ "explained in the documentation carried with this package ('/usr/share/"
-#~ "doc/vidalia/README.Debian')."
-#~ msgstr ""
-#~ "Näyttää siltä, että Tor-prosessi on jo käynnissä. Jos Tor halutaan "
-#~ "käynnistää Vidalian avulla, olemassa oleva Tor-prosessi täytyy ehkä "
-#~ "keskeyttää. Muussa tapauksessa Torin valitsin ”ControlPort” täytyy ottaa "
-#~ "käyttöön paketin dokumentaatiossa kerrotulla tavalla (tiedostossa /usr/"
-#~ "share/doc/vidalia/README.Debian). "
-
-#~ msgid ""
-#~ "Note that if you choose to let Vidalia start Tor, you will have to "
-#~ "manually disable Tor starting automatically on every reboot (See 'README."
-#~ "Debian')."
-#~ msgstr ""
-#~ "Jos Tor käynnistetään Vidalialla, täytyy Torin automaattinen "
-#~ "käynnistyminen järjestelmän käynnistymisen yhteydessä ottaa pois "
-#~ "käytöstä. (Katso tiedostoa README.Debian.)"
+#. 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:"
+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 ""
diff --git a/debian/0.2.x/po/fr.po b/debian/0.2.x/po/fr.po
index 8be2c7a..dd86976 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-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,56 +18,127 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. Type: select
+#. Type: note
#. Description
#: ../templates:2001
-msgid "Let Vidalia start Tor after stopping existing Tor process:"
+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 ""
-"Déléguer le lancement de Tor à Vidalia après arrêt des processus Tor "
-"existants :"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "No"
msgstr "Non"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr "Oui (uniquement cette fois)"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (and disable it for every boot)"
msgstr "Oui (et pour tous les redémarrages à venir)"
-#~ msgid ""
-#~ "Do you want to stop the existing Tor process and let Vidalia start Tor?"
-#~ msgstr ""
-#~ "Faut-il interrompre le processus Tor en cours et laisser Vidalia démarrer "
-#~ "Tor ?"
-
-#~ msgid ""
-#~ "It looks like there is a Tor process already running. If you want to "
-#~ "start Tor using Vidalia, you might have to stop the existing Tor process. "
-#~ "Otherwise you will have to enable 'ControlPort' option into Tor as "
-#~ "explained in the documentation carried with this package ('/usr/share/"
-#~ "doc/vidalia/README.Debian')."
-#~ msgstr ""
-#~ "Un processus Tor semble être en cours d'exécution. Si vous souhaitez "
-#~ "lancer Tor avec Vidalia, il peut être nécessaire d'interrompre ce "
-#~ "processus. Dans le cas contraire, vous devrez activer l'option "
-#~ "« ControlPort » de Tor, selon les instructions fournies avec ce paquet "
-#~ "dans le fichier usr/share/doc/vidalia/README.Debian."
-
-#~ msgid ""
-#~ "Note that if you choose to let Vidalia start Tor, you will have to "
-#~ "manually disable Tor starting automatically on every reboot (See 'README."
-#~ "Debian')."
-#~ msgstr ""
-#~ "Veuillez noter que si vous choisissez de lancer Tor avec Vidalia, il sera "
-#~ "nécessaire de désactiver le lancement automatique de Tor au démarrage du "
-#~ "système (comme expliqué dans le fichier README.Debian)."
+#. 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 ""
+"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:"
+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 ""
diff --git a/debian/0.2.x/po/it.po b/debian/0.2.x/po/it.po
index c44e247..faef0eb 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.7-4\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-0300\n"
"PO-Revision-Date: 2010-05-04 05:51+0200\n"
"Last-Translator: Vincenzo Campanella <vinz65 at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -16,54 +16,127 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
+#. Type: note
#. Description
#: ../templates:2001
-msgid "Let Vidalia start Tor after stopping existing Tor process:"
+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 ""
-"Lasciare che Vidalia avvii Tor dopo aver arrestato il processo di Tor "
-"attualmente in esecuzione:"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "No"
msgstr "No"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr "Sì (solo per ora)"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (and disable it for every boot)"
msgstr "Sì (e disabilitalo per ogni avvio)"
-#~ msgid ""
-#~ "Do you want to stop the existing Tor process and let Vidalia start Tor?"
-#~ msgstr ""
-#~ "Vuoi arrestare il processo di Tor esistente e che Vidalia avvii Tor?"
-
-#~ msgid ""
-#~ "It looks like there is a Tor process already running. If you want to "
-#~ "start Tor using Vidalia, you might have to stop the existing Tor process. "
-#~ "Otherwise you will have to enable 'ControlPort' option into Tor as "
-#~ "explained in the documentation carried with this package ('/usr/share/"
-#~ "doc/vidalia/README.Debian')."
-#~ msgstr ""
-#~ "Sembra che ci sia già un processo di Tor in esecuzione. Se vuoi avviare "
-#~ "Tor utilizzando Vidalia, dovresti arrestare il processo di Tor in "
-#~ "esecuzione. In caso contrario dovrai abilitare l'opzione 'ControlPort' in "
-#~ "Tor come illustrato nella documentazione allegata a questo pacchetto "
-#~ "('usr/share/doc/vidalia/README.Debian')."
-
-#~ msgid ""
-#~ "Note that if you choose to let Vidalia start Tor, you will have to "
-#~ "manually disable Tor starting automatically on every reboot (See 'README."
-#~ "Debian')."
-#~ msgstr ""
-#~ "Nota che se scegli che Vidalia avvii Tor, dovrai disabilitare manualmente "
-#~ "l'esecuzione automatica di Tor ad ogni riavvio (vedi 'README.Debian')."
+#. 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 ""
+"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:"
+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 ""
diff --git a/debian/0.2.x/po/pt.po b/debian/0.2.x/po/pt.po
index c7a0b05..5dce72c 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-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,53 +18,125 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Type: select
+#. Type: note
#. Description
#: ../templates:2001
-msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgstr "Deixar o Vidalia arrancar o Tor após parar o processo Tor existente:"
+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:2002
+#: ../templates:3001
msgid "No"
msgstr "Não"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr "Sim (apenas desta vez)"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (and disable it for every boot)"
msgstr "Sim (e desactivá-lo em todos os arranques)"
-#~ msgid ""
-#~ "Do you want to stop the existing Tor process and let Vidalia start Tor?"
-#~ msgstr ""
-#~ "Deseja parar o processo Tor existente e deixar o Vidalia iniciar o Tor?"
-
-#~ msgid ""
-#~ "It looks like there is a Tor process already running. If you want to "
-#~ "start Tor using Vidalia, you might have to stop the existing Tor process. "
-#~ "Otherwise you will have to enable 'ControlPort' option into Tor as "
-#~ "explained in the documentation carried with this package ('/usr/share/"
-#~ "doc/vidalia/README.Debian')."
-#~ msgstr ""
-#~ "Parece que já existe um processo Tor a correr. Se você deseja iniciar o "
-#~ "Tor usando o Vidalia, você poderá ter que parar o processo Tor existente. "
-#~ "Caso contrário você terá que activar a opção 'ControlPort' no Tor como "
-#~ "está explicado na documentação que acompanha este pacote ('/usr/share/doc/"
-#~ "vidalia/README.Debian')."
-
-#~ msgid ""
-#~ "Note that if you choose to let Vidalia start Tor, you will have to "
-#~ "manually disable Tor starting automatically on every reboot (See 'README."
-#~ "Debian')."
-#~ msgstr ""
-#~ "Note que se você deseja que o Vidalia inicie o Tor, você terá que "
-#~ "desactivar manualmente o arranque automático do Tor a cada arranque da "
-#~ "máquina (veja 'README.Debian')."
+#. 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:"
+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 ""
diff --git a/debian/0.2.x/po/ru.po b/debian/0.2.x/po/ru.po
index ba5206e..48322bf 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-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,27 +20,126 @@ 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: select
+#. Type: note
#. Description
#: ../templates:2001
-msgid "Let Vidalia start Tor after stopping existing Tor process:"
+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 ""
-"Позволить Vidalia запустить Tor после остановки существующего процесса Tor:"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "No"
msgstr "Нет"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr "Да (прямо сейчас)"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../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?"
+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:"
+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 ""
diff --git a/debian/0.2.x/po/sv.po b/debian/0.2.x/po/sv.po
index 7a7bb9b..2022766 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-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,54 +19,125 @@ msgstr ""
"X-Poedit-Language: Swedish\n"
"X-Poedit-Country: Sweden\n"
-#. Type: select
+#. Type: note
#. Description
#: ../templates:2001
-msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgstr "Låt Vidalia starta Tor när en existerande Tor-process stannar:"
+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:2002
+#: ../templates:3001
msgid "No"
msgstr "Nej"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr "Ja (den här gången)"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (and disable it for every boot)"
msgstr "Ja (och avaktivera det vid uppstarten av system)"
-#~ msgid ""
-#~ "Do you want to stop the existing Tor process and let Vidalia start Tor?"
-#~ msgstr ""
-#~ "Vill du stoppa den existerande Torprocessen för att låta Vidalia starta "
-#~ "Tor?"
-
-#~ msgid ""
-#~ "It looks like there is a Tor process already running. If you want to "
-#~ "start Tor using Vidalia, you might have to stop the existing Tor process. "
-#~ "Otherwise you will have to enable 'ControlPort' option into Tor as "
-#~ "explained in the documentation carried with this package ('/usr/share/"
-#~ "doc/vidalia/README.Debian')."
-#~ msgstr ""
-#~ "Det verkar som om det finns en Torprocess igång på den här datorn. Om du "
-#~ "vill starta Tor med Vidalia behöver den nuvarande Torprocessen först "
-#~ "avslutas. I annat fall måste du aktivera alternativet 'ControlPort' i Tor "
-#~ "vilket förklaras i dokumentationen till det här paketet ('/usr/share/doc/"
-#~ "vidalia/README.Debian')."
-
-#~ msgid ""
-#~ "Note that if you choose to let Vidalia start Tor, you will have to "
-#~ "manually disable Tor starting automatically on every reboot (See 'README."
-#~ "Debian')."
-#~ msgstr ""
-#~ "Kom ihåg att om du låter Vidalia starta Tor måste du avaktivera "
-#~ "automatisk start av Tor vid uppstart av systemet. (Läs mer i 'README."
-#~ "Debian')."
+#. 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:"
+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 ""
diff --git a/debian/0.2.x/po/templates.pot b/debian/0.2.x/po/templates.pot
index 22684bf..e937d6c 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-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,26 +17,123 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
+#. 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 "Let Vidalia start Tor after stopping existing Tor process:"
+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:2002
+#: ../templates:3001
msgid "No"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../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:"
+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 ""
diff --git a/debian/0.2.x/po/vi.po b/debian/0.2.x/po/vi.po
index 6f05726..c88ad32 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-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-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,27 +17,126 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.8\n"
-#. Type: select
+#. Type: note
#. Description
#: ../templates:2001
-msgid "Let Vidalia start Tor after stopping existing Tor process:"
+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 ""
-"Cho phép Vidalia khởi chạy Tor sau khi dừng chạy tiến trình Tor đã có :"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "No"
msgstr "Không"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr "Có (chỉ vào lúc này)"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../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?"
+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:"
+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 ""
diff --git a/debian/0.2.x/po/zh_CN.po b/debian/0.2.x/po/zh_CN.po
index 2bfd344..e09271b 100644
--- a/debian/0.2.x/po/zh_CN.po
+++ b/debian/0.2.x/po/zh_CN.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vidalia 0.1.13\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-0300\n"
"PO-Revision-Date: 2008-05-21 21:26+0800\n"
"Last-Translator: Vern Sun <s5unty at gmail.com>\n"
"Language-Team: Simplified Chinese <debian-chinese-gb at lists.debian.org>\n"
@@ -13,49 +13,125 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
+#. Type: note
#. Description
#: ../templates:2001
-msgid "Let Vidalia start Tor after stopping existing Tor process:"
-msgstr "停止正在运行的 Tor 进程,并让 Vidalia 来启动 Tor:"
+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:2002
+#: ../templates:3001
msgid "No"
msgstr "否"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr "是 (仅限本次)"
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (and disable it for every boot)"
msgstr "是 (同时禁用每次重启时的加载)"
-#~ msgid ""
-#~ "Do you want to stop the existing Tor process and let Vidalia start Tor?"
-#~ msgstr "您希望停止正在运行的 Tor 进程并且让 Vidalia 启动 Tor 吗?"
-
-#~ msgid ""
-#~ "It looks like there is a Tor process already running. If you want to "
-#~ "start Tor using Vidalia, you might have to stop the existing Tor process. "
-#~ "Otherwise you will have to enable 'ControlPort' option into Tor as "
-#~ "explained in the documentation carried with this package ('/usr/share/"
-#~ "doc/vidalia/README.Debian')."
-#~ msgstr ""
-#~ "看起来这里已经有一个 Tor 程序正在运行。如果您想用 Vidalia 启动 Tor,您或许"
-#~ "要停止当前正在运行的 Tor 程序。否则您应该像本软件包提供的说明('/usr/share/"
-#~ "doc/vidalia/README.Debian')那样启用 Tor 的 'ControlPort' 选项。"
-
-#~ msgid ""
-#~ "Note that if you choose to let Vidalia start Tor, you will have to "
-#~ "manually disable Tor starting automatically on every reboot (See 'README."
-#~ "Debian')."
-#~ msgstr ""
-#~ "请注意如果您选择让 Vidalia 启动 Tor,那么您应该手工禁止 Tor 在每次计算机重"
-#~ "启时自动运行 (请参考 'README.Debian')。"
+#. 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 "停止正在运行的 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:"
+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 ""
diff --git a/debian/0.2.x/po/zh_TW.po b/debian/0.2.x/po/zh_TW.po
index 219962e..9279675 100644
--- a/debian/0.2.x/po/zh_TW.po
+++ b/debian/0.2.x/po/zh_TW.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vidalia 0.1.13\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-05-20 21:51-0300\n"
+"POT-Creation-Date: 2010-09-24 14:01-0300\n"
"PO-Revision-Date: 2009-06-01 14:26+0800\n"
"Last-Translator: Vern Sun <s5unty at gmail.com>\n"
"Language-Team: Traditional Chinese <debian-chinese-big5 at lists.debian.org>\n"
@@ -13,49 +13,123 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
+#. 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 "Let Vidalia start Tor after stopping existing Tor process:"
+msgid ""
+"For more information please read '/usr/share/doc/vidalia/README.Debian'."
msgstr ""
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "No"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (just for now)"
msgstr ""
#. Type: select
#. Choices
-#: ../templates:2002
+#: ../templates:3001
msgid "Yes (and disable it for every boot)"
msgstr ""
-#~ msgid ""
-#~ "Do you want to stop the existing Tor process and let Vidalia start Tor?"
-#~ msgstr "您希望停止正在運行的 Tor 進程並且讓 Vidalia 啟動 Tor 嗎?"
-
-#~ msgid ""
-#~ "It looks like there is a Tor process already running. If you want to "
-#~ "start Tor using Vidalia, you might have to stop the existing Tor process. "
-#~ "Otherwise you will have to enable 'ControlPort' option into Tor as "
-#~ "explained in the documentation carried with this package ('/usr/share/"
-#~ "doc/vidalia/README.Debian')."
-#~ msgstr ""
-#~ "看起來這裏已經有一個 Tor 程序正在運行。如果您想用 Vidalia 啟動 Tor,您或許"
-#~ "要停止當前正在運行的 Tor 程序。否則您應該像本軟件包提供的説明('/usr/share/"
-#~ "doc/vidalia/README.Debian')那樣啟用 Tor 的 'ControlPort' 選項。"
-
-#~ msgid ""
-#~ "Note that if you choose to let Vidalia start Tor, you will have to "
-#~ "manually disable Tor starting automatically on every reboot (See 'README."
-#~ "Debian')."
-#~ msgstr ""
-#~ "請注意如果您選擇讓 Vidalia 啟動 Tor,那麼您應該手工禁止 Tor 在每次計算機重"
-#~ "啓時自動運行 (請參考 'README.Debian')。"
+#. 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:"
+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 ""
diff --git a/debian/0.2.x/postrm b/debian/0.2.x/postrm
index b3aa626..0def80c 100644
--- a/debian/0.2.x/postrm
+++ b/debian/0.2.x/postrm
@@ -1,8 +1,6 @@
#!/bin/sh
set -e
-#DEBHELPER#
-
if [ "$1" = "purge" ]; then
echo " Removing /etc/default/tor.vidalia"
rm -f /etc/default/tor.vidalia
@@ -11,4 +9,4 @@ if [ "$1" = "purge" ]; then
fi
fi
-exit 0
+#DEBHELPER#
diff --git a/debian/0.2.x/templates b/debian/0.2.x/templates
index 61c3640..86ae389 100644
--- a/debian/0.2.x/templates
+++ b/debian/0.2.x/templates
@@ -8,7 +8,45 @@
# 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
-_Description: Let Vidalia start Tor after stopping existing Tor process:
__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')
--
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