[Pkg-privacy-commits] [vidalia] 78/160: Introducing ControlSocket-by-Default changes
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:14:32 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 3bb15f5dc5e7b055cb99cb1a3da8ba41f4c12eb3
Author: Dererk <dererk at debian.org>
Date: Sat Sep 3 16:45:56 2011 -0300
Introducing ControlSocket-by-Default changes
---
debian/NEWS | 21 +++++++++
debian/README.Debian | 26 ++++++++++-
debian/README.source | 12 +++++
debian/changelog | 8 ++++
debian/config | 75 +++++++++++++-------------------
debian/control | 4 +-
debian/default.tor-off | 3 --
debian/default.tor-on | 1 -
debian/patches/series | 1 +
debian/patches/use-control-socket.patch | 22 ++++++++++
debian/po/ca.po | 67 +++++-----------------------
debian/po/cs.po | 73 +++++++------------------------
debian/po/da.po | 64 ++++-----------------------
debian/po/de.po | 66 ++++------------------------
debian/po/es.po | 74 ++++++-------------------------
debian/po/fi.po | 47 ++++----------------
debian/po/fr.po | 64 ++++-----------------------
debian/po/it.po | 64 ++++-----------------------
debian/po/nl.po | 33 ++++++++++++++
debian/po/pt.po | 77 ++++++++-------------------------
debian/po/ru.po | 75 +++++++-------------------------
debian/po/sv.po | 67 ++++++----------------------
debian/po/templates.pot | 55 +++++------------------
debian/po/vi.po | 62 +++++---------------------
debian/po/zh_CN.po | 68 +++++------------------------
debian/po/zh_TW.po | 68 +++++------------------------
debian/templates | 27 +++---------
debian/vidalia.install | 2 -
debian/vidalia.lintian-overrides | 1 -
29 files changed, 335 insertions(+), 892 deletions(-)
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..d78666c
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,21 @@
+vidalia (0.2.14-2) unstable; urgency=low
+
+ As #552556 got solved up through the years, really great news come up today
+ .
+ Having "Control Socket" enabled by default on Tor package lets us to
+ turn to almost zero configuration required for Vidalia users to run Tor
+ .
+ This means we are be able to speak, through a local Unix socket, with Tor
+ directly with no extra authentication required
+ .
+ Although this could appear to be frightening, basic POSIX permissions
+ are still required to access this socket, which, except in the case
+ you screw up your system, is pretty fair
+ .
+ To put things into perspective, most of all services on your system, even
+ the more sensible ones, have been secured this way over many decades,
+ so don't get stressed out! :-)
+ .
+ Kudos to Weasel&&everyone involved in this awesome goal.
+
+ -- Ulises Vitulli <dererk at debian.org> Sat, 03 Sep 2011 15:47:23 -0300
diff --git a/debian/README.Debian b/debian/README.Debian
index 0909d70..4a38d64 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,6 +1,30 @@
Vidalia for Debian
------------------
+
+ ---------------------------
+ DEPRECATED (or so)
+ ---------------------------
+
+
+
+Currently, Vidalia speaks directly through a socket to Tor, only required
+ steps to perform is to answer properly at Debconf templates for adding
+ Vidalia users into debian-tor group, who owns Tor's Control Socket.
+
+
+The following documentation is still valid, although its not expected for
+ for you to perform ANY of this steps to get Vidalia running.
+
+
+
+
+ ---------------------------
+ DEPRECATED (or so)
+ ---------------------------
+
+
+
For the anxious and impatient
-----------------------------
@@ -134,4 +158,4 @@ Vidalia supports three different ways of talking to Tor:
- -- Ulises Vitulli <dererk at debian.org> Tue, 19 Apr 2011 10:08:00 -0300
+ -- Ulises Vitulli <dererk at debian.org> Thu, 23 Jun 2011 10:46:24 -0300
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..e71ff2e
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,12 @@
+README.source for the vidalia package
+=====================================
+
+vidalia is managed in a Git repository using git-buildpackage (pristine-tar
+included). It follows most of the advice provided by Russ Allbery at:
+http://www.eyrie.org/~eagle/notes/debian/git.html
+
+You will be able to clone master and upstream branches at once using gbp:
+$ gbp-clone git://anonscm.debian.org/collab-maint/vidalia.git
+
+
+ -- Ulises Vitulli <dererk at debian.org> Sat, 23 Jul 2011 20:58:32 -0300
diff --git a/debian/changelog b/debian/changelog
index fe1aa2c..960d992 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vidalia (0.2.14-2) unstable; urgency=low
+
+ * The 'Napoleon-Of-Crime' dupload.
+ * Tor's ControlSocket enabled version upload allowed to port exp
+ changes to handle socket com out of the box (Closes: #640077).
+
+ -- Ulises Vitulli <dererk at debian.org> Sat, 03 Sep 2011 15:47:23 -0300
+
vidalia (0.2.14-1) unstable; urgency=low
* The 'Monday-Rocking-Skiing' dupload.
diff --git a/debian/config b/debian/config
index d7c5054..da17020 100644
--- a/debian/config
+++ b/debian/config
@@ -5,52 +5,35 @@ if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
fi
-seen='false'
-askuser() {
- question='vidalia/tor-daemon-interaction'
- db_input high $question || true
- db_go || true
- db_get $question
-}
-
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
- if dpkg -l tor > /dev/null 2>&1; then
- # installed
- if [ -e '/var/run/tor/tor.pid' ] || [ "$1" = "reconfigure" ]; then
- # and already running
- askuser
- seen='true'
- case "$RET" in
- (nothing)
- if [ -f /etc/default/tor.vidalia ]; then
- ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
- fi
- ;;
- (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
- ;;
- (permanent)
- invoke-rc.d --force tor stop
- ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-off /etc/default/tor.vidalia
- ;;
- esac
- fi
- fi
-
- if pgrep -x tor > /dev/null 2>&1; then
- # still running?? (e.g. chroot)
- if [ "$seen" = "false" ]; then
- askuser
- if [ "$RET" = "one-off" ] || [ "$RET" = "permanent" ]; then
- echo -n "Stopping tor daemon: "
- pkill -x tor > /dev/null && echo "tor." || echo 'Failed!'
- fi
- fi
- fi
- db_stop
+## Addopt Wicd-Netdev interaction approach.
+# Fix upgrades from broken experimental version
+db_get vidalia/users
+if [ -n "$( echo $RET | grep \${ )" ]; then
+ db_set vidalia/users ""
+ db_fset vidalia/users seen false
fi
+db_metaget vidalia/users users
+users="$(getent passwd | awk -F: '{if ($3 >= 1000 && $3 < 60000) print $1}' | sort | tr '\n' ',' | sed 's@,@, @g;s@, $@@g')"
+debiantor=$(getent group debian-tor | cut -d: -f4 | sed -e 's@,@ @g')
+
+# Don't show users already in debian-tor
+for u in $debiantor; do
+ users=$(echo $users | sed "s@$u, @@g;s@, $u\$@@g;s@^$u\$@@g");
+done
+
+db_subst vidalia/users users "$users"
+
+db_input high vidalia/users || true
+db_go
+
+db_get vidalia/users
+users=$(echo $RET | sed -e 's@,@@g')
+
+# Add selected users
+for u in $users; do
+ adduser --quiet $u debian-tor
+done
+
+
#DEBHELPER#
diff --git a/debian/control b/debian/control
index 93d06b9..0074fed 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/vidalia.git
Package: vidalia
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>=1.5.11) | debconf-2.0, ucf
-Recommends: tor
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>=1.5.11) | debconf-2.0,
+ ucf, adduser, tor (>= 0.2.2.29-beta-1)
Suggests: iceweasel-torbutton
Description: controller GUI for Tor
Vidalia offers a graphical user interface to start and stop Tor, view
diff --git a/debian/default.tor-off b/debian/default.tor-off
deleted file mode 100644
index 3e6dae2..0000000
--- a/debian/default.tor-off
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/vidalia ]; then
- RUN_DAEMON=no
-fi
diff --git a/debian/default.tor-on b/debian/default.tor-on
deleted file mode 100644
index 1e0ca6a..0000000
--- a/debian/default.tor-on
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/debian/patches/series b/debian/patches/series
index a8250ce..a608de8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
debians-tor-binary-path.patch
+use-control-socket.patch
diff --git a/debian/patches/use-control-socket.patch b/debian/patches/use-control-socket.patch
new file mode 100644
index 0000000..5ace2be
--- /dev/null
+++ b/debian/patches/use-control-socket.patch
@@ -0,0 +1,22 @@
+Author: dererk
+Description: Switch to Control Socket by default, this involves using Debian Tor from 0.2.2.29-beta or above
+--- old/src/vidalia/config/TorSettings.cpp 2011-06-23 11:03:12.809306636 -0300
++++ new/src/vidalia/config/TorSettings.cpp 2011-06-23 11:06:17.142220714 -0300
+@@ -48,7 +48,7 @@
+ /** Default to using hashed password authentication */
+ #define DEFAULT_AUTH_METHOD PasswordAuth
+ /** Default control method */
+-#define DEFAULT_CONTROL_METHOD "ControlPort"
++#define DEFAULT_CONTROL_METHOD "ControlSocket"
+ /** Default socket path */
+ #define DEFAULT_SOCKET_PATH ""
+
+@@ -84,7 +84,7 @@
+ setDefault(SETTING_CONTROL_PORT, 9051);
+ setDefault(SETTING_AUTH_METHOD, toString(DEFAULT_AUTH_METHOD));
+ setDefault(SETTING_CONTROL_METHOD, DEFAULT_CONTROL_METHOD);
+- setDefault(SETTING_SOCKET_PATH, DEFAULT_SOCKET_PATH);
++ setDefault(SETTING_SOCKET_PATH, "/var/run/tor/control");
+ setDefault(SETTING_DATA_DIRECTORY, "");
+ setDefault(SETTING_CONTROL_PASSWORD, "");
+ setDefault(SETTING_USE_RANDOM_PASSWORD, true);
diff --git a/debian/po/ca.po b/debian/po/ca.po
index b4b328f..f1a7c60 100644
--- a/debian/po/ca.po
+++ b/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-26 19:11-0300\n"
+"POT-Creation-Date: 2011-06-23 13:03-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,62 +15,17 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "Sense configuració"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "Reinicia una vegada"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "Control permanent"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Interacció Tor/Vidalia"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr ""
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
+msgstr ""
+
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 03ccb9b..a440247 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -1,12 +1,14 @@
+# Czech PO debconf template translation of vidalia.
+# Copyright (C) 2009 Martin Sin <martin.sin at zshk.cz>
# This file is distributed under the same license as the vidalia package.
-# Martin Sin <martin.sin at zshk.cz>, 2009.
+# Martin Sin <martin.sin at zshk.cz>, 2009 - 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: vidalia 0.1.13-3\n"
+"Project-Id-Version: vidalia 0.3.0alpha-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
-"PO-Revision-Date: 2010-09-27 19:28+0200\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
+"PO-Revision-Date: 2011-06-24 09:09+0200\n"
"Last-Translator: Martin Sin <martin.sin at zshk.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
"Language: cs\n"
@@ -14,62 +16,19 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "Bez nastavení"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "Jeden restart"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "Ovládání natrvalo"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Vztah Tor/Vidalia"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr "Uživatelé pro přidání do skupiny debian-tor:"
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
-"Vidalia komunikuje s běžícím daemonem Tor a vytváří k němu grafické "
-"uživatelské rozhraní. Pro zapnutí bezpečné autentizace (doporučeno) se "
-"vyžaduje ruční přenastavení Tor nebo restart Tor přímo pomocí Vidalia.\n"
-" * Bez nastavení:\n"
-" nechá Tor běžet. Vidalia nebude moci komunikovat s\n"
-" Tor dokud ho ručně nenastavíte - pro více informací se podívejte\n"
-" na soubor „/usr/share/doc/vidalia/README.Debian“;\n"
-" * Jeden restart:\n"
-" Vidalia vypne Tor a pak ho znovu zapne, pouze jednou - po restartu\n"
-" se Tor spustí opět sám, takže bude nutné provést některé ruční\n"
-" nastavení programu;\n"
-" * Ovládání natrvalo:\n"
-" ukončí Tor a o zbytek se bude starat Vidalia sama\n"
-" (nehodí se pro více-uživatelské systémy)."
+"Uživatelé, kteří budou moci ovládat daemon Tor, musí být přidáni do skupiny "
+"„debian-tor“."
diff --git a/debian/po/da.po b/debian/po/da.po
index 06d423d..8c4ff3d 100644
--- a/debian/po/da.po
+++ b/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-26 22:58-0300\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
"PO-Revision-Date: 2010-10-04 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,63 +16,17 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "Ingen konfiguration"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "Engangsgenstart"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "Permanent overtagelse"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Interaktion mellem Tor/Vidalia:"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr ""
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
-"Vidalia har brug for at kommunikere med den kørende Tordæmon, så den kan "
-"tilbyde en grafisk brugergrænseflade. Dette kræver enten en manuel "
-"rekonfiguration af Tor, så sikker godkendelse tillades (anbefales) eller "
-"en genstart af Tor under Vidalias kontrol.\n"
-" * Ingen konfiguration:\n"
-" lad Tor kører indtil videre. Vidalia vil ikke være i stand til\n"
-" at kommunikere med Tor, før den er manuelt rekonfigureret - se \n"
-" »/usr/share/doc/vidalia/README.Debian« for yderligere detaljer;\n"
-" * Engangsgenstart:\n"
-" stop Tor nu så Vidalia kan starte Tor, kun denne ene gang - Tor\n"
-" vil starte selv ved genstarter, så manuel konfiguration vil stadig\n"
-" være krævet;\n"
-" * Permanent overtagelse:\n"
-" stop Tor og lad Vidalia håndtere igangsættelse af Tor så snart du\n"
-" kører Vidalia (ikke brugbar på flerbrugersystemer)."
diff --git a/debian/po/de.po b/debian/po/de.po
index 94591ae..de8496b 100644
--- a/debian/po/de.po
+++ b/debian/po/de.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-26 19:11-0300\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
"PO-Revision-Date: 2010-10-04 19:47+0200\n"
"Last-Translator: Martin Eberhard Schauer <Martin.E.Schauer at gmx.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -17,64 +17,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "Keine Konfiguration"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "Einmaliger Neustart"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "Ständige Übernahme"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Zusammenarbeit von Tor und Vidalia:"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr ""
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
-"Damit Vidalia eine grafische Oberfläche für den laufenden Tor-Daemon "
-"bereitstellen kann, muss Vidalia mit ihm kommunizieren. Dies erfordert "
-"entweder die manuelle Neukonfiguration von Tor, um eine sichere "
-"Authentifizierung zu ermöglichen (empfohlen) oder einen von Vidalia "
-"gesteuerten Neustart von Tor.\n"
-" * Keine Konfiguration: \n"
-" Tor vorerst weiterlaufen lassen. Vidalia kann nicht mit Tor\n"
-" kommunizieren, bis er manuell neu konfiguriert wird - siehe\n"
-" »/usr/share/doc/Vidalia/README.Debian« für weitere Einzelheiten.\n"
-"* Einmaliger Neustart:\n"
-" Tor jetzt beenden, damit er dieses eine Mal von Vidalia gestartet\n"
-" wird. Tor startet bei den folgenden Systemstarts eigenständig. Eine\n"
-" manuelle Konfiguration bleibt weiterhin erforderlich.\n"
-" * Dauerhaften Übernahme:\n"
-" Tor beenden und bei jedem Start von Vidalia von ihr steuern lassen\n"
-" (kann auf Mehrbenutzer-Systemen nicht angewendet werden)."
-
diff --git a/debian/po/es.po b/debian/po/es.po
index f87698f..53905ec 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -1,10 +1,10 @@
# vidalia po-debconf translation to Spanish
-# Copyright (C) 2010 Software in the Public Interest
+# Copyright (C) 2010, 2011 Software in the Public Interest
# This file is distributed under the same license as the vidalia package.
#
# Changes:
# - Initial translation
-# Francisco Javier Cuadrado <fcocuadrado at gmail.com>, 2010
+# Francisco Javier Cuadrado <fcocuadrado at gmail.com>, 2010, 2011
#
# Traductores, si no conocen el formato PO, merece la pena leer la
# documentación de gettext, especialmente las secciones dedicadas a este
@@ -26,10 +26,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: vidalia 0.2.7-4\n"
+"Project-Id-Version: vidalia 0.3.0alpha-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 22:58-0300\n"
-"PO-Revision-Date: 2010-05-03 10:10+0200\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
+"PO-Revision-Date: 2011-06-26 19:03+0100\n"
"Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
"Language: es\n"
@@ -37,63 +37,15 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "Sin configuración"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "Reiniciar sólo una vez"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "Ceder el control permanentemente"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Tipo de interacción entre Tor y Vidalia:"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr "Usuarios a añadir al grupo «debian-tor»:"
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid ""
-"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 necesita comunicarse con el demonio en ejecución de Tor de modo que "
-"pueda proporcionar una interfaz gráfica de usuario para éste. Esto requiere "
-"una reconfiguración manual de Tor para permitir autenticación segura "
-"(recomendado) o reiniciar Tor bajo el control de Vidalia.\n"
-" * Sin configuración:\n"
-" dejar Tor en ejecución por ahora. Vidalia no podrá comunicarse con Tor \n"
-" hasta que se reconfigure manualmente, para más detalles vea el archivo \n"
-" «/usr/share/doc/vidalia/README.Debian».\n"
-" * Reiniciar sólo una vez:\n"
-" parar Tor ahora de modo que Vidalia pueda ejecutarlo, sólo una vez, Tor \n"
-" se iniciará al reiniciar el sistema, de modo que todavía se necesitará \n"
-" configuración manual.\n"
-" * Ceder el control permanentemente:\n"
-" parar Tor y dejar a Vidalia que gestione su inicio cuando se ejecute \n"
-" Vidalia (no se puede utilizar en un sistema con varios usuarios)."
+#: ../templates:1001
+msgid "Users who should be able to control Tor daemon need to be added to the group \"debian-tor\"."
+msgstr "Los usuarios que deberían poder controlar el demonio de Tor deben añadirse al grupo «debian-tor»."
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 27a37bc..5e6eb67 100644
--- a/debian/po/fi.po
+++ b/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-26 22:58-0300\n"
+"POT-Creation-Date: 2011-06-23 13:03-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,47 +17,16 @@ msgstr ""
"X-Poedit-Language: Finnish\n"
"X-Poedit-Country: FINLAND\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr ""
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
msgstr ""
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 4afb0c8..fa429ab 100644
--- a/debian/po/fr.po
+++ b/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-26 19:11-0300\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
"PO-Revision-Date: 2010-09-27 18:21+0200\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -18,63 +18,17 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "Pas de configuration"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "Redémarrage ponctuel"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "Prise de contrôle permanente"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Interaction entre Tor et Vidalia :"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr ""
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
-"Vidalia doit communiquer avec le démon en cours de Tor afin de lui fournir "
-"une interface graphique. Pour cela, Tor doit soit être reconfiguré pour "
-"permettre une authentification sûre (option recommandée) ou redémarré sous "
-"le contrôle de Vidalia.\n"
-" * Pas de configuration :\n"
-" Laisser Tor en route maintenant. Vidalia ne pourra pas\n"
-" communiquer avec lui tant que Tor n'est pas reconfiguré. Voir\n"
-" /usr/share/doc/vidalia/README.Debian pour plus d'informations ;\n"
-" * Redémarrage ponctuel :\n"
-" Arrêter Tor maintenant pour que Vidalia puisse le démarrer, juste\n"
-" cette fois-ci. Tor démarrera toujours de lui-même si la machine\n"
-" est relancée donc une configuration manuelle restera nécessaire ;\n"
-" * Prise de contrôle permanente :\n"
-" Arrêter Tor puis laisser Vidalia en gérer le lancement quand il\n"
-" est nécessaire (inutilisable sur un système multi-utilisateurs)."
diff --git a/debian/po/it.po b/debian/po/it.po
index 532aaa9..c3ccd98 100644
--- a/debian/po/it.po
+++ b/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-26 19:11-0300\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
"PO-Revision-Date: 2010-09-27 06:19+0200\n"
"Last-Translator: Vincenzo Campanella <vinz65 at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -16,63 +16,17 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "Nessuna configurazione"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "Un riavvio"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "Gestione permanente"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Interazione fra Tor e Vidalia:"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr ""
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
-"Vidalia deve poter comunicare con il demone di Tor in esecuzione, cui potrà "
-"così fornire un'interfaccia grafica. Questo implica o la riconfigurazione "
-"manuale di Tor per permettere un'autenticazione sicura (raccomandato) o un "
-"riavvio di Tor sotto il controllo di Vidalia.\n"
-" * Nessuna configurazione:\n"
-" per intanto lascia Tor in esecuzione. Vidalia non potrà comunicare\n"
-" con Tor finché quest'ultimo non verrà riconfigurato manualmente. Per\n"
-" ulteriori dettagli consultare «/usr/share/doc/vidalia/README.Debian»;\n"
-" * Un riavvio:\n"
-" arresta Tor adesso in modo che possa essere avviato da Vidalia, ma solo\n"
-" per questa volta. Ai prossimi riavvii Tor verrà eseguito autonomamente,\n"
-" per cui sarà comunque necessaria la riconfigurazione manuale;\n"
-" * Gestione permanente:\n"
-" arresta Tor e lascia che Vidalia ne gestisca l'avvio ogni qualvolta\n"
-" Vidalia viene eseguito (non utilizzabile in un sistema multi-utente)."
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 0000000..1ef79b2
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,33 @@
+# Dutch translation of PACKAGE debconf templates.
+# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Jeroen Schot <schot at a-eskwadraat.nl>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vidalia-0.3.0alpha-3\n"
+"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
+"PO-Revision-Date: 2011-07-04 09:49+0200\n"
+"Last-Translator: Jeroen Schot <schot at a-eskwadraat.nl>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr "Gebruikers om aan de groep debian-tor toe te voegen:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
+msgstr ""
+"Gebruikers die de Tor-achtergronddienst moeten kunnen bedienen moeten worden "
+"toegevoegd aan de groep \"debian-tor\"."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 87c270d..ffcf0d9 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -2,79 +2,36 @@
# Copyright (C) 2008 the vidalia's copyright holder
# This file is distributed under the same license as the vidalia package.
#
-# Américo Monteiro <a_monteiro at netcabo.pt>, 2008, 2010.
+# Américo Monteiro <a_monteiro at netcabo.pt>, 2008, 2010, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: vidalia 0.2.10-2\n"
+"Project-Id-Version: vidalia 0.3.0alpha-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
-"PO-Revision-Date: 2010-09-27 07:44+0100\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
+"PO-Revision-Date: 2011-06-23 17:42+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro at netcabo.pt>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "Nenhuma Configuração"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "Reiniciar uma vez"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "Aquisição permanente"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Interacção de Tor/Vidalia:"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr "utilizadores a adicionar ao grupo debian-tor:"
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
-"O vidalia precisa de comunicar com o daemon Tor em execução para que possa "
-"disponibiliza uma interface gráfica de utilizador para ele. Isto requer ou "
-"a reconfiguração manual do Tor para permitir autenticação segura "
-"(recomendado) ou um reiniciar do Tor sob o controlo do Vidalia.\n"
-" * Nenhuma configuração:\n"
-" Deixa o Tor em execução por agora. O Vidalia não poderá\n"
-" comunicar com o Tor até que este seja manualmente reconfigurado - \n"
-" veja \"/usr/share/doc/vidalia/README.Debian\" para mais detalhes;\n"
-" * Reiniciar uma vez:\n"
-" Parar o Tor agora para que o Vidalia o possa arrancar, apenas desta\n"
-" vez - o Tor irá arrancar por si próprio nos arranques do sistema,\n"
-" portanto ainda será necessária configuração manual;\n"
-" * Aquisição permanente:\n"
-" Parar o Tor e simplesmente deixar o Vidalia lidar com o arranque\n"
-" dele sempre que executa o Vidalia (não utilizável em sistemas de\n"
-" vários utilizadores)."
+"Os utilizadores que devam ser capazes de controlar o daemon do Tor precisam "
+"de ser adicionados ao grupo \"debian-tor\"."
+
+
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 9d57239..763d6a7 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the vidalia package.
#
# Yuri Kozlov <kozlov.y at gmail.com>, 2008.
-# Yuri Kozlov <yuray at komyakino.ru>, 2010.
+# Yuri Kozlov <yuray at komyakino.ru>, 2010, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: vidalia 0.2.10-2\n"
+"Project-Id-Version: vidalia 0.3.0alpha-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
-"PO-Revision-Date: 2010-09-27 20:43+0400\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
+"PO-Revision-Date: 2011-06-23 21:17+0400\n"
"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
"Language: ru\n"
@@ -20,65 +20,20 @@ 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
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "Без настройки"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "Однократный перезапуск"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "Постоянный захват"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Взаимодействие Tor/Vidalia:"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr "Пользователи, добавляемые в группу debian-tor:"
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
-"Для предоставления пользовательского графического интерфейса Vidalia "
-"требуется обращаться к работающей службе Tor. Для этого требуется "
-"ручная перенастройка Tor, при которой нужно включить безопасную "
-"аутентификацию "
-"(рекомендуется) или перезапуск Tor под управлением Vidalia.\n"
-" * Без настройки:\n"
-" сейчас оставить Tor запущенным. Vidalia не сможет связаться с\n"
-" Tor пока он не будет перенастроен вручную — подробности\n"
-" смотрите в «/usr/share/doc/vidalia/README.Debian»;\n"
-" * Однократный перезапуск:\n"
-" остановить Tor сейчас, чтобы Vidalia смогла его запустить, но\n"
-" только единожды — Tor самостоятельно запустится пере перезагрузке,\n"
-" поэтому всё ещё требуется ручная настройка;\n"
-" * Постоянный захват:\n"
-" остановить Tor и просто позволить Vidalia запускать его когда вы\n"
-" запускаете Vidalia (непригодно для работы в многопользовательской "
-"системе)."
+"Пользователи, которым нужно управлять службой Tor, должны быть добавлены "
+"в группу «debian-tor»."
+
diff --git a/debian/po/sv.po b/debian/po/sv.po
index fc14b11..167e49c 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,14 +1,14 @@
# Translation of vidalia debconf template to Swedish
-# Copyright (C) 2010 Martin Bagge <brother at bsnet.se>
+# Copyright (C) 2011 Martin Bagge <brother at bsnet.se>
# This file is distributed under the same license as the vidalia package.
#
-# Martin Bagge <brother at bsnet.se>, 2008, 2010
+# Martin Bagge <brother at bsnet.se>, 2008, 2010, 2011
msgid ""
msgstr ""
"Project-Id-Version: vidalia\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
-"PO-Revision-Date: 2010-09-27 10:49+0100\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
+"PO-Revision-Date: 2011-06-28 21:20+0100\n"
"Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
"Language: sv\n"
@@ -20,57 +20,18 @@ msgstr ""
"X-Poedit-Country: Sweden\n"
"X-Poedit-Bookmarks: -1,-1,-1,-1,6,-1,-1,-1,-1,-1\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "Ändra inte inställningar nu"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "Starta om en gång"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "Ta över permanent"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Interaktion mellan Tor och Vidalia"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr "Användare som ska läggas till i gruppen debian-tor:"
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
-"Vidalia behöver kommunicera med den körande Tor-tjänsten så att den ett grafiskt användargränssnitt kan tillhandahållas. Detta kräver antingen manuell ändring av Tor för att tillåta säker autentisiering (rekomenderas) eller en omstart av Tor under Vidalias överinseende.\n"
-" * Ändra inte inställningar nu:\n"
-" låt Tor köra vidare nu. Vidalia kommer inte att kunna kommunicera\n"
-" med Tor förens manuell hantering av inställningarna är genomfört. Läs \n"
-" \"/usr/share/doc/vidalia/README.Debian\" för detaljer;\n"
-" * Starta om en gång:\n"
-" stoppa Tor nu så att Vidalia kan start det, men bara den här gången. Tor \n"
-" kommer att starta själv vid systemets uppstart. Manuell hantering av \n"
-" inställningar kommer att behövas.\n"
-" * Ta över permanent:\n"
-" stoppa Tor och låt Vidalia ta över uppstarten av Tor när du kör Vidalia\n"
-" (fungerar inte på fleranvändarsystem)."
-
+"Användare som ska kunna kontrollera Tor-tjänsten måste läggas till i gruppen "
+"\"debian-tor\"."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 4ef8eb1..ab7ebb8 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,63 +1,30 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Debconf translations for vidalia.
+# Copyright © 2011, Ulises Vitulli
+# This file is distributed under the same license as the vidalia package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 22:58-0300\n"
+"POT-Creation-Date: 2011-06-23 13:03-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"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr ""
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
msgstr ""
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 60b5247..aa398cd 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,7 +6,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-26 19:11-0300\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
"PO-Revision-Date: 2010-09-28 19:17+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -17,57 +17,17 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.8\n"
-#: ../templates:1001
-#. Type: select
-#. Choices
-msgid "No Configuration"
-msgstr "Không có cấu hình"
-
-#: ../templates:1001
-#. Type: select
-#. Choices
-msgid "One-off restart"
-msgstr "Khởi chạy lại một lần"
-
-#: ../templates:1001
-#. Type: select
-#. Choices
-msgid "Permanent takeover"
-msgstr "Tiếp quản hẳn"
-
-#: ../templates:1002
-#. Type: select
+#. Type: multiselect
#. Description
-msgid "Tor/Vidalia interaction:"
-msgstr "Tương tác Tor/Vidalia"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr ""
-#: ../templates:1002
-#. Type: select
+#. Type: multiselect
#. Description
+#: ../templates:1001
msgid ""
-"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 "Phần mềm Vidalia cần liên lạc với trình nền Tor đang chạy, để cung cấp một giao diện đồ họa cho nó. Trường hợp này cần thiết hoặc sự cấu hình lại Tor bằng tay để cho phép xác thức bảo mật (khuyến khích) hoặc sự khởi chạy lại Tor được Vidalia điều khiển.\n"
-" • Không có cấu hình\n"
-" Để lại Tor chạy tạm thời.\n"
-" Vidalia không liên lạc được với Tor trước khi nó được cấu hình lại bằng tay:\n"
-" xem tài liệu Đọc Đi « /usr/share/doc/vidalia/README.Debian » để tìm chi tiết.\n"
-" • Khởi chạy lại một lần\n"
-" Dừng chạy Tor ngay bây giờ đến khi nó được cấu hình lại bằng tay.\n"
-" Tor sẽ tự khởi chạy khi khởi động lại hệ thống thì vẫn còn cần cấu hình lại bằng tay.\n"
-" • Tiếp quản hẳn\n"
-" Dừng chạy Tor và đơn giản cho phép Vidalia quản lý việc khởi chạy nó\n"
-" khi nào bạn chạy Vidalia (không sử dụng được trên một hệ thống đa người dùng). "
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
+msgstr ""
+
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index cd637fa..caad043 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -2,10 +2,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Vidalia 0.2.10\n"
+"Project-Id-Version: Vidalia 0.3.0\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 22:58-0300\n"
-"PO-Revision-Date: 2010-10-05 00:44+0800\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
+"PO-Revision-Date: 2011-06-25 14:05+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,61 +13,17 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "不做任何配置"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "首次重新启动"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "改变启动方式"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Tor 和 Vidalia 如何交互:"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr "添加到 debian-tor 组的用户:"
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
-"Tor 的图形化用户界面程序 Vidalia 需要和运行中的 Tor 程序进行交互。这就需要"
-"Tor 以安全认证的方式授权 Vidalia (推荐的方式)，或者由 Vidalia 重启 Tor 程"
-"序。\n"
-" * 不做任何配置:\n"
-" 维持当前运行的 Tor 程序不变，直到您手动调整了 Tor 配置文件以后 —— 查看\n"
-" \"/usr/share/doc/vidalia/README.Debian\" 获取更多相关信息；\n"
-" * 首次重新启动:\n"
-" 停止当前运行的 Tor 程序，直到您首次运行 Vidalia 时帮您重启 Tor 程序 ——\n"
-" 因为 Tor 程序在下次系统重启后会自动运行，所以您仍然需要手动调整 Tor 的\n"
-" 配置文件；\n"
-" * 改变启动方式:\n"
-" 停止当前运行的 Tor 程序，并且禁用 Tor 程序随系统开机自动运行，改成随\n"
-" Vidalia 程序启动时自动运行。(注意: 这种方式并不适合多用户使用的系统)。"
-
+"使用 Vidalia 操控 Tor 的用户需要被添加到 \"debian-tor\" 组。"
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 13ba995..3d68f8b 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -2,10 +2,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Vidalia 0.2.10\n"
+"Project-Id-Version: Vidalia 0.3.0\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 22:58-0300\n"
-"PO-Revision-Date: 2010-10-05 00:44+0800\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
+"PO-Revision-Date: 2011-06-25 14:05+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,61 +13,17 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr "不做任何配置"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr "首次重新啟動"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr "改變啟動方式"
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
-msgstr "Tor 和 Vidalia 如何交互:"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr "添加到 debian-tor 組的用戶:"
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"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)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
-"Tor 的圖形化用戶界面程序 Vidalia 需要和運行中的 Tor 程序進行交互。這就需要"
-"Tor 以安全認證的方式授權 Vidalia (推薦的方式)，或者由 Vidalia 重啟 Tor 程"
-"序。\n"
-" * 不做任何配置:\n"
-" 維持當前運行的 Tor 程序不變，直到您手動調整了 Tor 配置檔案以後 —— 查看\n"
-" \"/usr/share/doc/vidalia/README.Debian\" 獲取更多相關信息；\n"
-" * 首次重新啟動:\n"
-" 停止當前運行的 Tor 程序，直到您首次運行 Vidalia 時幫您重啟 Tor 程序 ——\n"
-" 因為 Tor 程序在下次系統重啟後會自動運行，所以您仍然需要手動調整 Tor 的\n"
-" 配置檔案；\n"
-" * 改變啟動方式:\n"
-" 停止當前運行的 Tor 程序，並且禁用 Tor 程序隨系統開機自動運行，改成隨\n"
-" Vidalia 程序啟動時自動運行。(注意: 這種方式並不適合多用戶使用的系統)。"
-
+"使用 Vidalia 操控 Tor 的用戶需要被添加到 \"debian-tor\" 組。"
diff --git a/debian/templates b/debian/templates
index 6e9b47a..de3ab6c 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,21 +1,6 @@
-Template: vidalia/tor-daemon-interaction
-Type: select
-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).
+Template: vidalia/users
+Type: multiselect
+Choices: ${users}
+_Description: Users to add to the debian-tor group:
+ Users who should be able to control Tor daemon need to be added to the
+ group "debian-tor".
diff --git a/debian/vidalia.install b/debian/vidalia.install
index 4919049..081729d 100644
--- a/debian/vidalia.install
+++ b/debian/vidalia.install
@@ -1,4 +1,2 @@
debian/vidalia.xpm usr/share/pixmaps
debian/vidalia.desktop usr/share/applications
-debian/default.tor-on usr/share/vidalia
-debian/default.tor-off usr/share/vidalia
diff --git a/debian/vidalia.lintian-overrides b/debian/vidalia.lintian-overrides
deleted file mode 100644
index 7049838..0000000
--- a/debian/vidalia.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-vidalia: unused-debconf-template
--
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