[Pkg-privacy-commits] [vidalia] 05/26: Merged changes from pkg version 2.x to 3.x series. Featuring: - Debconf templates interfaces changes - Debconf templates translations - Updated patches and refreshed - Prompt warnings from 2.x (still valid I think) - Minor context changes
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:15:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch experimental
in repository vidalia.
commit 0e6eb532cf71ea1dae1d6fefb97ee8c80f944f81
Author: Dererk <dererk at debian.org>
Date: Wed Mar 7 11:24:55 2012 -0300
Merged changes from pkg version 2.x to 3.x series.
Featuring:
- Debconf templates interfaces changes
- Debconf templates translations
- Updated patches and refreshed
- Prompt warnings from 2.x (still valid I think)
- Minor context changes
---
debian/NEWS | 33 +++-
debian/README.Debian | 276 ++++++++++++++++++---------
debian/changelog | 7 +
debian/config | 49 ++---
debian/control | 4 +-
debian/gbp.conf | 2 +
debian/patches/debians-tor-binary-path.patch | 8 +-
debian/patches/use-control-socket.patch | 10 +-
debian/po/ca.po | 19 +-
debian/po/cs.po | 28 ++-
debian/po/da.po | 32 +++-
debian/po/de.po | 32 +++-
debian/po/es.po | 28 ++-
debian/po/fi.po | 20 +-
debian/po/fr.po | 31 ++-
debian/po/id.po | 43 +++++
debian/po/it.po | 19 +-
debian/po/nl.po | 39 ++--
debian/po/pt.po | 30 ++-
debian/po/ru.po | 31 ++-
debian/po/sv.po | 31 ++-
debian/po/templates.pot | 30 ++-
debian/po/vi.po | 19 +-
debian/po/zh_CN.po | 38 +++-
debian/po/zh_TW.po | 38 +++-
debian/postinst | 25 +++
debian/templates | 7 +-
debian/watch | 2 +-
28 files changed, 692 insertions(+), 239 deletions(-)
diff --git a/debian/NEWS b/debian/NEWS
index a63e2dd..46afa9c 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,33 @@
-vidalia (0.3.0alpha-2) experimental; urgency=low
+vidalia (0.2.17-1) unstable; urgency=low
+
+ A known bug has been introduced at this release point (in fact it was on
+ 0.2.16, see below), which produces a little undesired effect on very
+ particular configuration sets.
+ .
+ Bug description:
+ If you use Vidalia to control Tor and change Tor's config but Vidalia's
+ saveconf attempt fails (e.g. because Vidalia is controlling the system Tor
+ and it can't write to /etc/tor/torrc, which is default), then Vidalia will
+ tell Tor to quit reloading its torrc on hup.
+ .
+ This is a feature by its own, because now the changes Vidalia made won't be
+ silently overwritten at daily's Tor logrotation, but it's a bug too, because
+ if you logrotate before hupping, Tor won't open any new logs.
+ .
+ /As a resume/, this translates into an undesired effect on Tor's logging
+ capacity, but it's highly unlikely this will affect any of your privacy
+ properties at any point.
+ .
+ See upstreams's bug report at:
+ https://trac.torproject.org/projects/tor/ticket/5095
+ .
+ For the curious, there was indeed a 0.2.16 upstrem release, which differs
+ from the version you're now at by just a little policy change on Vidalia's
+ user interface translations.
+
+ -- Ulises Vitulli <dererk at debian.org> Sat, 11 Feb 2012 22:26:58 -0300
+
+vidalia (0.2.14-2) unstable; urgency=low
As #552556 got solved up through the years, really great news come up today
.
@@ -18,4 +47,4 @@ vidalia (0.3.0alpha-2) experimental; urgency=low
.
Kudos to Weasel&&everyone involved in this awesome goal.
- -- Ulises Vitulli <dererk at debian.org> Thu, 23 Jun 2011 10:46:24 -0300
+ -- 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 4a38d64..8620ad2 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,161 +1,247 @@
Vidalia for Debian
-------------------
+-------------------
- ---------------------------
- DEPRECATED (or so)
- ---------------------------
+ Default Configuration: Simplest and Painless
+ =============================================
-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.
+ Currently, Vidalia speaks against Tor directly through a local (unix) socket.
+ This is recommended and Debian's default configuration.
+ Only two (even only one) steps are required to be performed:
-The following documentation is still valid, although its not expected for
- for you to perform ANY of this steps to get Vidalia running.
+ 1. Answer debconf question at Vidalia's config/upgrade time with the proper
+ user/list of users that you'll allow to connect/configure/monitor your
+ local instance of Tor, and,
+ 2. If the user/any of the users from the list below is currently logged in,
+ he/she will have to restart his/her X session before starting Vidalia.
+ That would be all!
- ---------------------------
- DEPRECATED (or so)
- ---------------------------
+ ------------------------------------------------------------------------------
+ This is default and recommended configuration because the bast majority of
+ the users will find here the most suitable choice for a local Tor daemon.
+ ------------------------------------------------------------------------------
- For the anxious and impatient
- -----------------------------
+
+
+
+ The 'But...'
+ =============
+
+ On the other hand, there could be a few situations in which you wont be able
+ to use this configuration profile, some of them being:
-There are three ways of running Vidalia:
+ - You couldn't convince an admin to add you into the list of local system
+ users allowed to control Tor
+ - The Tor instance you're willing to control runs on a remote host
+ - Some old manuscripts have been recently revealed vulnerabilities on the
+ unixsocket implementation, or simply you just don't wish to use it because
+ you dislike the word 'unix' on 'unixsocket'.
-1. (Re)Configure Vidalia not to let Tor start, and simply start Vidalia.
-2. Enable Tor's ControlPort and enable CookieAuthentication in Tor's config,
+
+ In this cases, or whichever ones you may find, you can still make use any of
+ the following alternatives:
+
+ 1. If facing a local Tor daemon situation in which you are unable to connect
+ for some reason to the system-wide Tor's Control Socket (as the example
+ explained below), you can still launch a personal Tor session and manually
+ configure Vidalia to use it.
+
+ 2. Enable Tor's ControlPort and enable CookieAuthentication in Tor's config,
then grab the cookie file from /var/lib/tor/control_auth_cookie, profit!
- (RECOMMENDED for greater security)
-3. Enable Tor's ControlPort, get a hashed password at 'tor --hash-password',
+
+ 3. Enable Tor's ControlPort, get a hashed password at 'tor --hash-password',
load back the output into the HashedControlPassword Tor's config field,
profit!
+ 'Two Tor instances on the same machine' Issue
+ ==============================================
- Full and complete explanation
- -----------------------------
-Vidalia provides a graphical graphical user interface to configure
-different aspects of the Tor Network, check its status at a glance,
-monitor its bandwidth usage or maybe just view Tor's event logs.
-This means that Vidalia needs to talk to the Tor daemon.
+ Be aware that if you choose to connect to Tor using a different method that
+ Debian's default, you'll be hitting a bug on Vidalia. This will also happen
+ if you have two instances of Tor running on the same maching.
+ See https://trac.torproject.org/projects/tor/ticket/4823 and
+ http://bugs.debian.org/654644 for more information.
-Vidalia supports three different ways of talking to Tor:
-1. Let Vidalia start the Tor process on its own.
- ---------------------------------------------
+
+
+
+ Detailed description
+ ---------------------
+ Vidalia provides a graphical graphical user interface to configure
+ different aspects of the Tor Network, check its status at a glance,
+ monitor its bandwidth usage or maybe just view Tor's event logs.
+ This means that Vidalia needs to talk to the Tor daemon.
- ------> "I want it, and I want it NOW!"
+ If for some reason you decide/are forced not to go by the default profile
+ which configures everything for you at Vidalia's installation time, you
+ may use any of this different approaches to have Vidalia and Tor working.
- This option is the simplest, but not usable on a multi-user system.
- Debconf offers this as the default option, but it can be easily
- reconfigured at any time by running 'dpkg-reconfigure vidalia'.
+ 1. Launch your own personal Tor session
+ ------------------------------------
+
*********************** FOR PARANOIDS ONLY ***************************
- | |
- | |
- | In the remote and unlikely event of a bug existing in the |
+ | |
+ | |
+ | In the remote and unlikely event of a bug existing in the |
| Tor routing algorithm or implementation itself, it might be |
| _relatively_ easy, or at least possible, for a remote user to |
- | gain access to the data of the user launching Vidalia (what's |
- | known as a "privilege escalation" attack) |
- | |
- | |
- | This will be much more difficult if you run Vidalia using |
- | either of the two alternatives described below. |
- | |
- | |
- | ** Please consider using them if possible! ** |
- | |
- | |
+ | gain access to the data of the user launching Vidalia. |
+ | |
+ | |
+ | This will be much more difficult if you run Vidalia using |
+ | either of the two alternatives described below. |
+ | |
+ | |
+ | ** Please consider using them if possible! ** |
+ | |
+ | |
*********************** FOR PARANOIDS ONLY ***************************
+ Required Steps:
+ # Start your own personal Tor session binary, create proper paths:
+ $ mkdir ~/.tor
+ $ chown $USER. ~/.tor && chmod go-rwx ~/.tor
+ $ /usr/sbin/tor ControlSocket ~/.tor/socket SocksPort $RANDOM ControlPort 0
-2. Enable Tor to use a control cookie to communicate with Vidalia.
- ---------------------------------------------------------------
+ # Make a note on the $RANDOM port it has used. You'll see something like:
+ Feb 13 12:28:20.819 [notice] Tor v0.2.2.35 (git-73ff13ab3cc9570d). This is experimental software. Do not rely on it for strong anonymity. (Running on Linux x86_64)
+ Feb 13 12:28:20.820 [notice] Initialized libevent version 2.0.16-stable using method epoll. Good.
+ Feb 13 12:28:20.820 [notice] Opening Socks listener on 127.0.0.1:3771
- * The best password is the one you don't have to know about *
+ In this case, 3771 is your lucky number and you'll use it as socks port
+ for your favourite browser network preferences, polipo or privoxy, etc.
- This method consists of a password-less authentication. This means
- you won't have to remember any password, but you'll have to grab a
- very important and *SECRET* file from your disc, called "Auth Cookie".
+ # Launch Vidalia process. It will fail trying to start, because it's
+ unable to connect or because some other reason.
- To enable this profile, edit Tor's configuration file, by default at
- '/etc/tor/torrc', add or uncomment both the 'ControlPort' and the
- 'CookieAuthentication' options, setting the last one to 1.
+ # Manually configure your Vidalia instance:
+ # Go to "Settings"
+ # Click on "Advanced" icon
+ # At "Tor Control" block, choose "Use Unix domain socket (ControlSocket)"
+ # Set "Path" to "/home/$USER$/.tor/socket" and click on "OK"
+ # Now click on "Start Tor" and enjoy! :-)
- You will end up having something like this:
- # egrep '(ControlPort|Auth)' /etc/tor/torrc
- ControlPort 9051
- CookieAuthentication 1
+ 2. Enable Tor to use a control cookie to communicate with Vidalia.
+ ---------------------------------------------------------------
- Now start/reload/restart the Tor daemon, and start Vidalia (as a regular X
- user). Vidalia will ask you for a "cookie file" at the next run:
+ * The best password is the one you don't have to know about *
-
- ------------------------------------------------------------------------
- You will have to fetch the "cookie file" from your local filesystem,
- by default at '/var/lib/tor/control_auth_cookie'
+ This method consists of a password-less authentication. This means
+ you won't have to remember any password, but you'll have to grab a
+ very important and *SECRET* file from disk, called "Auth Cookie".
- DO NOT share this file with anyone, Tor depends on it!
- ------------------------------------------------------------------------
+ To enable this profile, edit Tor's configuration file, by default at
+ '/etc/tor/torrc', add or uncomment both the 'ControlPort' and the
+ 'CookieAuthentication' options, setting the last one to 1.
+ You will end up having something like this:
- This option might be simpler than all the others, but will require you
- to grab a different cookie file every time you restart the Tor process,
- in contrast to the next methods.
+ # egrep '(ControlPort|Auth)' /etc/tor/torrc
+ ControlPort 9051
+ CookieAuthentication 1
- This is my preferred and recommended method, simple and easy, no
- passwords.
+ Now start/reload/restart the Tor daemon, and start Vidalia (as a regular X
+ user). Vidalia will ask you for a "cookie file" at the next run:
+
+ ------------------------------------------------------------------------
+ You will have to fetch the "cookie file" from your local filesystem,
+ by default at '/var/lib/tor/control_auth_cookie'
-3. Enable Tor to use a control passowrd to communicate with Vidalia.
- -----------------------------------------------------------------
+ DO NOT share this file with anyone, Tor's privacy depends on it!
+ ------------------------------------------------------------------------
- Edit the Tor configuration file, by default '/etc/tor/torrc', add or
- uncomment both the 'ControlPort' and 'HashedControlPassword' options
- and load 'tor --hash-password' hash got from the output into it,
- as shown below:
-
- # tor --hash-password SOME_PASSWORD_HERE
- Sep 17 18:48:49.421 [notice] Tor v0.2.0.30 (r15956). This is experimental
- software. Do not rely on it for strong anonymity. (Running on Linux x86_64)
-
- 16:167F667A98F859D2600BD708B48B95343FEF7800B479E2AA4284ACF029
+ This option might be simpler than all the others, but will require you
+ to grab a different cookie file every time you restart the Tor process,
+ in contrast to the next methods.
-
- You will end up with something like this:
-
- # grep Control /etc/tor/torrc
- ControlPort 9051
- HashedControlPassword 16:167F667A98F...4ACF029
+ This is my preferred and recommended method, simple and easy, no
+ passwords.
+
+
+
+ 3. Enable Tor to use a control password to communicate with Vidalia.
+ -----------------------------------------------------------------
+
+ Edit the Tor configuration file, by default '/etc/tor/torrc', add or
+ uncomment both the 'ControlPort' and 'HashedControlPassword' options
+ and load 'tor --hash-password' hash got from the output into it,
+ as shown below:
+
+
+ # tor --hash-password SOME_PASSWORD_HERE
+ Sep 17 18:48:49.421 [notice] Tor v0.2.0.30 (r15956). This is experimental
+ software. Do not rely on it for strong anonymity. (Running on Linux x86_64)
+
+ 16:167F667A98F859D2600BD708B48B95343FEF7800B479E2AA4284ACF029
+
+
+ You will end up with something like this:
+
+ # grep Control /etc/tor/torrc
+ ControlPort 9051
+ HashedControlPassword 16:167F667A98F...4ACF029
+
+
+ Now start/reload/restart the Tor daemon, and start Vidalia (as a regular X
+ user). Vidalia will ask you for the set password ('SOME_PASSWORD_HERE'
+ as for the example) at the next run and it will start using a secure
+ authentication.
+
+
+
+ Last Minute Notes (Quoted from debian/NEWS)
+ ===========================================
+
+ A known bug has been introduced at this release point (in fact it was on
+ 0.2.16, see below), which produces a little undesired effect on very
+ particular configuration sets.
+
+ Bug description:
+ If you use Vidalia to control Tor and change Tor's config but Vidalia's
+ saveconf attempt fails (e.g. because Vidalia is controlling the system Tor
+ and it can't write to /etc/tor/torrc, which is default), then Vidalia will
+ tell Tor to quit reloading its torrc on hup.
+
+ This is a feature by its own, because now the changes Vidalia made won't be
+ silently overwritten at daily's Tor logrotation, but it's a bug too, because
+ if you logrotate before hupping, Tor won't open any new logs.
+
+ /As a resume/, this translates into an undesired effect on Tor's logging
+ capacity, but it's highly unlikely this will affect any of your privacy
+ properties at any point.
+ See upstreams's bug report at:
+ https://trac.torproject.org/projects/tor/ticket/5095
- Now start/reload/restart the Tor daemon, and start Vidalia (as a regular X
- user). Vidalia will ask you for the set password ('SOME_PASSWORD_HERE'
- as for the example) at the next run and it will start using a secure
- authentication.
+ For the curious, there was indeed a 0.2.16 upstrem release, which differs
+ from the version you're now at by just a little policy change on Vidalia's
+ user interface translations.
- -- Ulises Vitulli <dererk at debian.org> Thu, 23 Jun 2011 10:46:24 -0300
+ -- Ulises Vitulli <dererk at debian.org> Sun, 12 Jun 2012 19:21:02 -0300
diff --git a/debian/changelog b/debian/changelog
index c5f01e0..112aafd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vidalia (0.3.1-1) experimental; urgency=low
+
+ * New upstream release, experimental branched.
+ * Bumped up to Standards-Version 3.9.3. No changes required.
+
+ -- Ulises Vitulli <dererk at debian.org> Wed, 07 Mar 2012 11:13:58 -0300
+
vidalia (0.3.0alpha-4) experimental; urgency=low
* Modifications introduced on Debconf templates, translation round:
diff --git a/debian/config b/debian/config
index da17020..9407eb6 100644
--- a/debian/config
+++ b/debian/config
@@ -5,35 +5,26 @@ if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
fi
-## 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
+## Addopt wicd-netdev interaction approach.
+if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
+
+ # Get regular/non-system users
+ users="$(getent passwd | awk -F: '{if ($3 >= 1000 && $3 < 60000) print $1}' | sort | tr '\n' ',' | sed 's@,@, @g;s@, $@@g')"
+
+ # Get a list of users into 'debian-tor' group
+ 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
+
+ # Substract already present users
+ db_subst vidalia/users users "$users"
+ if [ "$users" != "" ]; then
+ db_input high vidalia/users || true
+ db_go
+ fi
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 0074fed..66edd80 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
Source: vidalia
Section: net
Priority: extra
-Maintainer: Vern Sun <s5unty at gmail.com>
-Uploaders: Ulises Vitulli <dererk at debian.org>, Erinn Clark <erinn at torproject.org>
+Maintainer: Ulises Vitulli <dererk at debian.org>
+Uploaders: Vern Sun <s5unty at gmail.com>
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.9.2.0
Homepage: https://www.torproject.org/projects/vidalia
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/patches/debians-tor-binary-path.patch b/debian/patches/debians-tor-binary-path.patch
index f12f55c..660d528 100644
--- a/debian/patches/debians-tor-binary-path.patch
+++ b/debian/patches/debians-tor-binary-path.patch
@@ -1,8 +1,10 @@
Author: dererk
Description: Even though upstream has implemented a block of code to perform this check, as Tor's binary is located in /usr/sbin path, regular users are likely to lack that path in their PATH enviroment variable. This patch purpose is setting it to the right Debian's Tor package.
---- old/src/vidalia/config/TorSettings.cpp 2009-01-14 13:56:54.000000000 -0200
-+++ new/src/vidalia/config/TorSettings.cpp 2010-01-23 06:02:41.930010310 -0300
-@@ -68,7 +68,8 @@
+Index: git/src/vidalia/config/TorSettings.cpp
+===================================================================
+--- git.orig/src/vidalia/config/TorSettings.cpp 2012-03-07 11:13:33.000000000 -0300
++++ git/src/vidalia/config/TorSettings.cpp 2012-03-07 11:23:57.000000000 -0300
+@@ -77,7 +77,8 @@
else
setDefault(SETTING_TOR_EXECUTABLE, programFiles + "\\Tor\\tor.exe");
#else
diff --git a/debian/patches/use-control-socket.patch b/debian/patches/use-control-socket.patch
index 5ace2be..eab5ac4 100644
--- a/debian/patches/use-control-socket.patch
+++ b/debian/patches/use-control-socket.patch
@@ -1,8 +1,10 @@
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 @@
+Index: git/src/vidalia/config/TorSettings.cpp
+===================================================================
+--- git.orig/src/vidalia/config/TorSettings.cpp 2012-02-11 22:21:38.000000000 -0300
++++ git/src/vidalia/config/TorSettings.cpp 2012-02-11 22:21:38.000000000 -0300
+@@ -49,7 +49,7 @@
/** Default to using hashed password authentication */
#define DEFAULT_AUTH_METHOD PasswordAuth
/** Default control method */
@@ -11,7 +13,7 @@ Description: Switch to Control Socket by default, this involves using Debian Tor
/** Default socket path */
#define DEFAULT_SOCKET_PATH ""
-@@ -84,7 +84,7 @@
+@@ -86,7 +86,7 @@
setDefault(SETTING_CONTROL_PORT, 9051);
setDefault(SETTING_AUTH_METHOD, toString(DEFAULT_AUTH_METHOD));
setDefault(SETTING_CONTROL_METHOD, DEFAULT_CONTROL_METHOD);
diff --git a/debian/po/ca.po b/debian/po/ca.po
index f1a7c60..05656ab 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: 2011-06-23 13:03-0300\n"
+"POT-Creation-Date: 2012-01-06 01:47-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"
@@ -25,7 +25,20 @@ msgstr ""
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"Select which users from the list below should be able to control Tor daemon."
msgstr ""
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr ""
diff --git a/debian/po/cs.po b/debian/po/cs.po
index a440247..1cdeee3 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: vidalia 0.3.0alpha-2\n"
+"Project-Id-Version: vidalia 0.2.15-1\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-06-24 09:09+0200\n"
+"POT-Creation-Date: 2012-01-06 01:47-0300\n"
+"PO-Revision-Date: 2012-01-09 19:34+0100\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"
@@ -26,9 +26,23 @@ msgstr "Uživatelé pro přidání do skupiny debian-tor:"
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"Select which users from the list below should be able to control Tor daemon."
+msgstr "Vyberte uživatele, kteří by měli mít dovoleno ovládat daemon Tor."
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
msgstr ""
-"Uživatelé, kteří budou moci ovládat daemon Tor, musí být přidáni do skupiny "
-"„debian-tor“."
+"Pro použití změn restartujte prosím vaše sezení X ještě před spuštěním "
+"Vidalia."
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr ""
+"Pro více informací si prosím přečtěte /usr/share/doc/vidalia/README.Debian.gz."
diff --git a/debian/po/da.po b/debian/po/da.po
index 8c4ff3d..4759079 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -1,16 +1,16 @@
# Danish translation Vidalia.
-# Copyright (C) 2010 Vidalia & Joe Hansen.
+# Copyright (C) 2012 Vidalia & Joe Hansen.
# This file is distributed under the same license as the Vidalia package.
-# Joe Hansen <joedalton2 at yahoo.dk>, 2010.
+# Joe Hansen <joedalton2 at yahoo.dk>, 2010, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: vidalia\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-23 13:03-0300\n"
-"PO-Revision-Date: 2010-10-04 17:30+01:00\n"
+"POT-Creation-Date: 2012-01-05 08:26-0300\n"
+"PO-Revision-Date: 2012-01-14 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"
+"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,13 +20,31 @@ msgstr ""
#. Description
#: ../templates:1001
msgid "Users to add to the debian-tor group:"
+msgstr "Brugere at tilføje til gruppen debian-tor:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Select which users from the list below should be able to control Tor daemon."
+msgstr ""
+"Vælg hvilke brugere fra listen nedenfor der skal kunne kontrollere dæmonen Tor."
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
msgstr ""
+"Genstart venligst dine X-sessioner for at anvende ændringerne før du starter "
+"Vidalia."
#. Type: multiselect
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
msgstr ""
+"For yderligere information så se venligst /usr/share/doc/vidalia/README.Debian.gz."
diff --git a/debian/po/de.po b/debian/po/de.po
index de8496b..8283d2a 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -1,32 +1,50 @@
# Translation of vidalia debconf templates to German
# Copyright (C) Helge Kreutzmann <debian at helgefjell.de>, 2008.
-# Copyright (C) Martin Eberhard Schauer <Martin.E.Schauer at gmx.de>, 2010.
+# Copyright (C) Martin Eberhard Schauer <Martin.E.Schauer at gmx.de>, 2010, 2011.
# This file is distributed under the same license as the vidalia package.
#
msgid ""
msgstr ""
-"Project-Id-Version: vidalia 0.2.10-2\n"
+"Project-Id-Version: vidalia 0.2.15-1\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-23 13:03-0300\n"
-"PO-Revision-Date: 2010-10-04 19:47+0200\n"
+"POT-Creation-Date: 2012-01-06 01:47-0300\n"
+"PO-Revision-Date: 2012-01-16 18:30+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"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
#. Type: multiselect
#. Description
#: ../templates:1001
msgid "Users to add to the debian-tor group:"
+msgstr "Benutzer, die Mitglied der Gruppe »debian-tor« werden sollen:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Select which users from the list below should be able to control Tor daemon."
+msgstr ""
+"Wählen Sie aus der folgenden Liste die Benutzer, die den Tor-Daemon steuern "
+"dürfen."
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
msgstr ""
+"Vor dem Start von Vidalia starten Sie bitte Ihre X-Sitzungen neu, damit die "
+"Änderungen wirksam werden."
#. Type: multiselect
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
msgstr ""
+"Weitere Informationen finden Sie in /usr/share/doc/vidalia/README.Debian.gz."
diff --git a/debian/po/es.po b/debian/po/es.po
index 53905ec..3a72687 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -28,9 +28,9 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.3.0alpha-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-23 13:03-0300\n"
+"POT-Creation-Date: 2012-01-06 01:47-0300\n"
"PO-Revision-Date: 2011-06-26 19:03+0100\n"
-"Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
+"Last-Translator: Dererk <dererk at debian.org>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -46,6 +46,26 @@ msgstr "Usuarios a añadir al grupo «debian-tor»:"
#. 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 "Los usuarios que deberían poder controlar el demonio de Tor deben añadirse al grupo «debian-tor»."
+msgid ""
+"Select which users from the list below should be able to control Tor daemon."
+msgstr ""
+"Seleccione que usuarios de la lista de arriba deberían ser capaces de controlar"
+"el demonio de Tor."
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr ""
+"Por favor, cierre y vuelva a iniciar sus sesiones gráficas X para aplicar los"
+"cambios antes de comenzar a utilizar Vidalia."
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr "Para más información, por favor refiérase a"
+"/usr/share/doc/vidalia/README.Debian.gz"
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 5e6eb67..509f9c7 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: 2011-06-23 13:03-0300\n"
+"POT-Creation-Date: 2012-01-06 01:47-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"
@@ -27,6 +27,20 @@ msgstr ""
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"Select which users from the list below should be able to control Tor daemon."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
msgstr ""
diff --git a/debian/po/fr.po b/debian/po/fr.po
index fa429ab..253b53e 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -2,33 +2,50 @@
# Copyright (C) 2008 Christian Perrier <bubulle at debian.org>
# This file is distributed under the same license as the vidalia package.
#
-# Christian Perrier <bubulle at debian.org>, 2008, 2010.
+# Christian Perrier <bubulle at debian.org>, 2008, 2010, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-23 13:03-0300\n"
-"PO-Revision-Date: 2010-09-27 18:21+0200\n"
+"POT-Creation-Date: 2012-01-06 01:47-0300\n"
+"PO-Revision-Date: 2012-01-09 18:33+0100\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
"Language: \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: multiselect
#. Description
#: ../templates:1001
msgid "Users to add to the debian-tor group:"
-msgstr ""
+msgstr "Identifiants à ajouter au groupe debian-tor :"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Select which users from the list below should be able to control Tor daemon."
+msgstr "Veuillez choisir les utilisateurs autorisés à contrôler le démon Tor."
#. Type: multiselect
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"Please restart your X sessions to apply changes before starting Vidalia."
msgstr ""
+"Il est nécessaire de redémarrer les sessions X pour que les modifications "
+"prennent effet avant de démarrer Vidalia."
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr ""
+"Pour plus d'informations, veuillez consulter le fichier /usr/share/doc/"
+"vidalia/README.Debian.gz."
diff --git a/debian/po/id.po b/debian/po/id.po
new file mode 100644
index 0000000..4f9fc4d
--- /dev/null
+++ b/debian/po/id.po
@@ -0,0 +1,43 @@
+# Debconf translations for vidalia.
+# Copyright © 2011, Ulises Vitulli
+# This file is distributed under the same license as the vidalia package.
+# Mahyuddin Susanto <udienz at ubuntu.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vidalia 0.2.15-2\n"
+"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
+"POT-Creation-Date: 2012-01-06 01:47-0300\n"
+"PO-Revision-Date: 2012-02-05 20:53+0700\n"
+"Last-Translator: Mahyuddin Susanto <udienz at ubuntu.com>\n"
+"Language-Team: Debian Indonesia Translators <debian-l10n-indonesian at lists.debian.org>\n"
+"Language: id\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Indonesian\n"
+"X-Poedit-Country: INDONESIA\n"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
+msgstr "Pengguna yang akan dimasukkan dalam grup debian-tor:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Select which users from the list below should be able to control Tor daemon."
+msgstr "Pilih pengguna dari daftar dibawah ini yang akan dapat mengendalikan daemon Tor."
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Please restart your X sessions to apply changes before starting Vidalia."
+msgstr "Silakan mulai ulang sesi X anda untuk menerapkan perubahan sebelum memulai Vidalia."
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "For more information, please refer to /usr/share/doc/vidalia/README.Debian.gz."
+msgstr "Untuk informasi lebih lanjut, silakan merujuk ke /usr/share/doc/vidalia/README.Debian."
diff --git a/debian/po/it.po b/debian/po/it.po
index c3ccd98..971189d 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: 2011-06-23 13:03-0300\n"
+"POT-Creation-Date: 2012-01-06 01:47-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"
@@ -26,7 +26,20 @@ msgstr ""
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"Select which users from the list below should be able to control Tor daemon."
msgstr ""
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr ""
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 1ef79b2..32e4137 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -1,14 +1,14 @@
-# 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.
+# Dutch translation of vidalia debconf templates.
+# Copyright (C) 2011-2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the vidalia package.
+# Jeroen Schot <schot at a-eskwadraat.nl>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: vidalia-0.3.0alpha-3\n"
+"Project-Id-Version: vidalia 0.3.0alpha-4\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"
+"POT-Creation-Date: 2012-01-06 01:47-0300\n"
+"PO-Revision-Date: 2012-01-05 15:07+0100\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"
@@ -26,8 +26,25 @@ msgstr "Gebruikers om aan de groep debian-tor toe te voegen:"
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"Select which users from the list below should be able to control Tor daemon."
msgstr ""
-"Gebruikers die de Tor-achtergronddienst moeten kunnen bedienen moeten worden "
-"toegevoegd aan de groep \"debian-tor\"."
+"Selecteer in de onderstaande lijst de gebruikers die de Tor-"
+"achtergronddienst moeten kunnen bedienen."
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr ""
+"Om de veranderingen door te voeren dient u uw X-sessies opnieuw te starten "
+"voordat u Vidalia start."
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr ""
+"Meer informatie kunt u vinden in /usr/share/doc/vidalia/README.Debian.gz."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index ffcf0d9..883a4de 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the vidalia package.
#
# Américo Monteiro <a_monteiro at netcabo.pt>, 2008, 2010, 2011.
+# Miguel Figueiredo <elmig at debianpt.org>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.3.0alpha-2\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-06-23 17:42+0100\n"
-"Last-Translator: Américo Monteiro <a_monteiro at netcabo.pt>\n"
+"POT-Creation-Date: 2012-01-06 01:47-0300\n"
+"PO-Revision-Date: 2012-01-09 20:45+0000\n"
+"Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
@@ -28,10 +29,25 @@ msgstr "utilizadores a adicionar ao grupo debian-tor:"
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"Select which users from the list below should be able to control Tor daemon."
msgstr ""
-"Os utilizadores que devam ser capazes de controlar o daemon do Tor precisam "
-"de ser adicionados ao grupo \"debian-tor\"."
+"Escolha quais os utilizadores da lista abaixo que devem ser capazes de "
+"controlar o daemon Tor."
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr ""
+"Por favor reinicie as suas sessões de X para aplicar as alterações antes de "
+"iniciar o Vidalia."
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr ""
+"Para mais informação, por favor veja /usr/share/doc/vidalia/README.Debian.gz."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 763d6a7..aad4708 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, 2011.
+# Yuri Kozlov <yuray at komyakino.ru>, 2010, 2011, 2012.
msgid ""
msgstr ""
-"Project-Id-Version: vidalia 0.3.0alpha-2\n"
+"Project-Id-Version: vidalia 0.2.15-1\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-06-23 21:17+0400\n"
+"POT-Creation-Date: 2012-01-06 01:47-0300\n"
+"PO-Revision-Date: 2012-01-06 09:40+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"
@@ -17,8 +17,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"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: multiselect
#. Description
@@ -30,10 +30,21 @@ msgstr "Пользователи, добавляемые в группу debian-
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"Select which users from the list below should be able to control Tor daemon."
msgstr ""
-"Пользователи, которым нужно управлять службой Tor, должны быть добавлены "
-"в группу «debian-tor»."
+"Выберите пользователей из списка, которым разрешено управлять службой Tor."
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr "Перед запуском Vidalia перезапустите X-сеансы для активации изменений."
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr "Подробности смотрите в /usr/share/doc/vidalia/README.Debian.gz"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 167e49c..49c835d 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,14 +1,14 @@
# Translation of vidalia debconf template to Swedish
-# Copyright (C) 2011 Martin Bagge <brother at bsnet.se>
+# Copyright (C) 2012 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, 2011
+# Martin Bagge <brother at bsnet.se>, 2008, 2010 - 2012
msgid ""
msgstr ""
"Project-Id-Version: vidalia\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-06-28 21:20+0100\n"
+"POT-Creation-Date: 2012-01-06 01:47-0300\n"
+"PO-Revision-Date: 2012-01-10 23:33+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"
@@ -30,8 +30,23 @@ msgstr "Användare som ska läggas till i gruppen debian-tor:"
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"Select which users from the list below should be able to control Tor daemon."
msgstr ""
-"Användare som ska kunna kontrollera Tor-tjänsten måste läggas till i gruppen "
-"\"debian-tor\"."
+"Ange vilka användare från listan nedan som ska kunna kontrollera Tor-"
+"tjänsten."
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr ""
+"Xsessioner måste startas om för att aktivera ändringar innan Vidalia startas."
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr "Läs mer i /usr/share/doc/vidalia/README.Debian.gz."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index ab7ebb8..fddd605 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,16 +1,18 @@
-# Debconf translations for vidalia.
-# Copyright © 2011, Ulises Vitulli
-# This file is distributed under the same license as the vidalia package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: vidalia\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2011-06-23 13:03-0300\n"
+"POT-Creation-Date: 2012-01-06 01:47-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"
@@ -25,6 +27,20 @@ msgstr ""
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"Select which users from the list below should be able to control Tor daemon."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index aa398cd..4f2eed0 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: 2011-06-23 13:03-0300\n"
+"POT-Creation-Date: 2012-01-06 01:47-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"
@@ -27,7 +27,20 @@ msgstr ""
#. Description
#: ../templates:1001
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
+"Select which users from the list below should be able to control Tor daemon."
msgstr ""
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr ""
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index caad043..266c6c1 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -4,11 +4,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Vidalia 0.3.0\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-06-25 14:05+0800\n"
+"POT-Creation-Date: 2012-01-06 01:47-0300\n"
+"PO-Revision-Date: 2012-01-06 21:10+0800\n"
"Last-Translator: Vern Sun <s5unty at gmail.com>\n"
"Language-Team: Chinese <debian-l10n-chinese at lists.debian.org>\n"
-"Language: \n"
+"Language: Simplified Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -22,8 +22,32 @@ msgstr "添加到 debian-tor 组的用户:"
#. Type: multiselect
#. Description
#: ../templates:1001
+#, fuzzy
+#| msgid ""
+#| "Select which users from the list below should be able to control Tor "
+#| "daemon"
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
-msgstr ""
-"使用 Vidalia 操控 Tor 的用户需要被添加到 \"debian-tor\" 组。"
+"Select which users from the list below should be able to control Tor daemon."
+msgstr "请从下方的列表中选择有权访问 Tor 程序的用户"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please restart your X sessions to apply changes before starting Vidalia"
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr "在启动 Vidalia 之前请重新启动您的 X 会话以便使前面的设定生效"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+#, fuzzy
+#| msgid ""
+#| "For more information please refer to /usr/share/doc/vidalia/README.Debian."
+#| "gz"
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr "更多信息请参考 /usr/share/doc/vidalia/README.Debian.gz"
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 3d68f8b..a8273c9 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -4,11 +4,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Vidalia 0.3.0\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-06-25 14:05+0800\n"
+"POT-Creation-Date: 2012-01-06 01:47-0300\n"
+"PO-Revision-Date: 2012-01-06 21:11+0800\n"
"Last-Translator: Vern Sun <s5unty at gmail.com>\n"
"Language-Team: Chinese <debian-l10n-chinese at lists.debian.org>\n"
-"Language: \n"
+"Language: Traditional Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -22,8 +22,32 @@ msgstr "添加到 debian-tor 組的用戶:"
#. Type: multiselect
#. Description
#: ../templates:1001
+#, fuzzy
+#| msgid ""
+#| "Select which users from the list below should be able to control Tor "
+#| "daemon"
msgid ""
-"Users who should be able to control Tor daemon need to be added to the group "
-"\"debian-tor\"."
-msgstr ""
-"使用 Vidalia 操控 Tor 的用戶需要被添加到 \"debian-tor\" 組。"
+"Select which users from the list below should be able to control Tor daemon."
+msgstr "請從下方的列表中選擇有權訪問 Tor 程序的用戶"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please restart your X sessions to apply changes before starting Vidalia"
+msgid ""
+"Please restart your X sessions to apply changes before starting Vidalia."
+msgstr "在啟動 Vidalia 之前請重新啟動您的 X 會話以便使前面的設定生效"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+#, fuzzy
+#| msgid ""
+#| "For more information please refer to /usr/share/doc/vidalia/README.Debian."
+#| "gz"
+msgid ""
+"For more information, please refer to /usr/share/doc/vidalia/README.Debian."
+"gz."
+msgstr "更多信息請參考 /usr/share/doc/vidalia/README.Debian.gz"
diff --git a/debian/postinst b/debian/postinst
index c369c73..94a6349 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,4 +4,29 @@ if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
fi
+
+case "$1" in
+ configure|reconfigure)
+ # We don't go under this approach since Vidalia 0.2.14-3,
+ # so we need to nicely remove deprecated files
+ if dpkg --compare-versions "$2" lt-nl "0.2.14-3"; then
+ if [ -f /etc/default/tor.vidalia ]; then
+ rm -f /etc/default/tor.vidalia
+ if [ -x "/usr/bin/ucf" ]; then
+ ucf --purge /etc/default/tor.vidalia
+ fi
+ fi
+ fi
+
+ 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
+ ;;
+esac
+
+
#DEBHELPER#
diff --git a/debian/templates b/debian/templates
index de3ab6c..6fbcf5b 100644
--- a/debian/templates
+++ b/debian/templates
@@ -2,5 +2,8 @@ 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".
+ Select which users from the list below should be able to control Tor daemon.
+ .
+ Please restart your X sessions to apply changes before starting Vidalia.
+ .
+ For more information, please refer to /usr/share/doc/vidalia/README.Debian.gz.
diff --git a/debian/watch b/debian/watch
index 1028d1c..2d297a4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
# avoid evaluating development releases (0.2.x branches)
opts=uversionmangle=s/0\.2\./~pre/ \
- http://www.torproject.org/vidalia/dist/vidalia-(.*)\.tar\.gz
+ https://www.torproject.org/dist/vidalia/vidalia-(.*)\.tar\.gz
--
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