Re: [Pkg-freevo-maint] Bug#607921: freevo: (unowned) files in /home (after purge (policy 6.8))

To: A Mennucc <mennucc1@debian.org>
Cc: debian-release@lists.debian.org
Subject: Re: [Pkg-freevo-maint] Bug#607921: freevo: (unowned) files in /home (after purge (policy 6.8))
From: Julien Cristau <jcristau@debian.org>
Date: Tue, 28 Dec 2010 20:44:41 +0100
Message-id: <[🔎] 20101228194441.GM2813@radis.liafa.jussieu.fr>
In-reply-to: <4D1A3C84.5070803@debian.org>
References: <201012241246.16824.holger@layer-acht.org> <20101227154844.GA3381@radis.liafa.jussieu.fr> <4D19121B.4090209@debian.org> <20101227232019.GB2813@radis.liafa.jussieu.fr> <4D1A215B.3070401@debian.org> <[🔎] 20101228175248.GK2813@radis.liafa.jussieu.fr> <4D1A3C84.5070803@debian.org>
Please don't drop the cc.  Re-adding.

On Tue, Dec 28, 2010 at 20:37:40 +0100, A Mennucc wrote:

> Il 28/12/2010 18:52, Julien Cristau ha scritto:
> > The python2.6 stuff doesn't fix a RC bug, as far as I can tell.
> 
> It is a long story.
> 
> For long time freevo 1.9.0-5 was in testing and 1.9.0-6 in unstable and
> I used both of them in my freevo box and all seemed fine; then a lot of
> RC bugs popped up.
> 
> Remark 1:upstream /usr/bin/freevo has an internal mechanism by which it
> chooses the newest python version avaliable and restart itself with it.
> 
> It all started with RC bug 606782 ; at first I thought this was due to
> an incompatibility during upgrade with python 2.6 ; so I prepared freevo
> 1.9.0-7 , that forced freevo to use python 2.5 (disabling the mechanism
> in remark 1 above). I uploaded it.
> 
> Few days later I realized that the box where I was testing 606782 over
> and over again, had python2.7 installed in it (!)  : so the 'bug' I
> thought I had solved was not an incompatibility of freevo with
> python2.6, but with python2.7 (!!) Moreover I took some time to setup
> some qemu clean installs of lenny and squeeze, and I checked that
> 1.9.0-7 had not solved 606782 (this was long and painstackingly slow).
> 
> Moreover I realized that bug 606782 occours when python-freevo 1.8 is
> installed and freevo is not installed in lenny, and then upgrade to
> squeeze follows. No bug would appear if freevo (any 1.9.0 version) is
> installed in squeeze pristine (i.e. not an upgrade from 1.8). So I
> finally understood what is causing the bug (see below).
> 
> So I reverted the changes made in 1.9.0-7 .  Please see the debdiff wrt
> 1.9.0-5, that I attach.
> 
> In the meantime I also realized that freevo *IS* reasonably compatible
> with python2.6  : indeed I have a freevo box at home that runs on
> squeeze, and due to remark 1 above, I checked that it has been running
> on python2.6 all along, and the only problems are some warnings at
> start, and python2.6 not accepting string exceptions (I imported an
> upstream patch for that).
> 
> > Why are pycentral errors ignored?
> 
> Because that is the real cause for bug 606782
> 
> It all started with some bugs such as 531340 , all due to the fact that
> python-central is buggy, and leaves compiled files around when freevo is
> upgraded ; so in freevo 1.9.0-4 we decided to use python-support instead
> of python-central; so I added a snippet in preinst to remove all cruft
> left around by python-central. But unfortunately the snippet 'pycentral
> pkgremove freevo' can fail if python-freevo is installed and freevo was
> never installed (so this was causing bug 606782); since pycentral AFAICT
> has no command to tell you if something was installed or not, the
> easiest way around is call that snippet and to ignore the error. In any
> case, there is a complex 'find | xargs rm' command following these that
> will remove any leftover python-central garbage.
> 
> Let me remark that I tested the upgrade lenny->squeeze in qemu clean
> installations and now I am sure that the bug 606782 is solved.
> 
> > The freevo-lirc.postinst change is not documented.
> 
> You are right.
> 
> The call '/usr/bin/freevo makelircrc -w' is problematic. It can be used
> to generate automatically a template file for freevo lirc support : so
> it has to be run as root. But if it is called at install time, before
> freevo is ever started, then it creates a lot of dirs inside
> /var/lib/freevo/cache/vfs as root, and then freevo fails to start. I
> noted this fact during many tests in the aforementioned qemu installs. I
> have no time to investigate this and to find a better solution, so I
> simply disabled it.
> 
> ---
> 
> I am now fairly confident that 1.9.0-8 works fine: I tested it inside
> qemu, and in my notebook; to be 100% sure, tomorrow I will install it in
> my home freevo box, and test that it does all the usual magic (that my
> family likes so much): TV recording and playing, video reencoding,
> family pictures, etc etc.
> 
> > Cheers,
> > Julien
> 
> bye, thanks for caring
> 
> a.

> File lists identical (after any substitutions)
> 
> Control files of package freevo: lines which differ (wdiff format)
> ------------------------------------------------------------------
> Depends: debconf (>= 0.5) | debconf-2.0, [-python,-] python-support (>= 0.90.0), {+python (<< 2.7), python (>= 2.5),+} python-freevo (= [-1.9.0-5),-] {+1.9.0-8),+} freevo-data (= [-1.9.0-5),-] {+1.9.0-8),+} mplayer, lsdvd, console-tools | kbd, debconf, adduser, xinit
> Version: [-1.9.0-5-] {+1.9.0-8+}
> 
> Control files of package freevo-data: lines which differ (wdiff format)
> -----------------------------------------------------------------------
> Recommends: freevo (= [-1.9.0-5)-] {+1.9.0-8)+}
> Version: [-1.9.0-5-] {+1.9.0-8+}
> 
> Control files of package freevo-doc: lines which differ (wdiff format)
> ----------------------------------------------------------------------
> Version: [-1.9.0-5-] {+1.9.0-8+}
> 
> Control files of package freevo-lirc: lines which differ (wdiff format)
> -----------------------------------------------------------------------
> Depends: freevo (= [-1.9.0-5),-] {+1.9.0-8),+} python-pylirc, lirc
> Version: [-1.9.0-5-] {+1.9.0-8+}
> 
> Control files of package python-freevo: lines which differ (wdiff format)
> -------------------------------------------------------------------------
> Depends: [-python,-] python-support (>= 0.90.0), {+python (<< 2.7), python (>= 2.5),+} python-alsaaudio, python-libxml2, python-beautifulsoup (>= 3.0.1), python-html5lib, python-kaa-imlib2 (>= 0.2.2), python-kaa-metadata (>= 0.7.1), python-kaa-base (>= 0.4.0), python-pygame (>> 1.7.1release-4.1+b1), python-imaging, python-twisted (>= 2.5.0), python-sqlite
> {+Recommends: freevo (= 1.9.0-8)+}
> Version: [-1.9.0-5-] {+1.9.0-8+}

> diff -Nru freevo-1.9.0/debian/changelog freevo-1.9.0/debian/changelog
> --- freevo-1.9.0/debian/changelog	2010-08-11 16:07:26.000000000 +0200
> +++ freevo-1.9.0/debian/changelog	2010-12-28 11:21:12.000000000 +0100
> @@ -1,3 +1,39 @@
> +freevo (1.9.0-8) unstable; urgency=low
> +
> +  * found the culprit of bug 606782, so closes: #606782 once and forall
> +  * analyzed the python2.6 compatibility,
> +    - fixed: "Python string exceptions no more allowed in Python 2.6",
> +      thanks to Sandro Tosi and charrea6 (Closes: #585292)
> +    - did a lot of testing with python2.6
> +    so re-enable python2.6
> +  * Create all directories in /var/lib/freevo (Closes: #607921).
> +
> + -- A Mennucc1 <mennucc1@debian.org>  Mon, 27 Dec 2010 23:36:00 +0100
> +
> +freevo (1.9.0-7) unstable; urgency=high
> +
> +  * add 'Recommends: freevo' to python-freevo
> +  * this version of freevo works fine with python2.5 but 
> +    not with newer versions
> +    - force /usr/bin/freevo.real to select python2.5
> +    - set shebangs in scripts to /usr/bin/python2.5
> +    - set pyversions to '2.5' , and B-D to python2.5
> +  * all the above should also solve the bug
> +    "package fails to upgrade properly from lenny"; thanks to
> +    Lucas Nussbaum (Closes: #606782)
> +
> + -- A Mennucc1 <mennucc1@debian.org>  Thu, 23 Dec 2010 10:49:15 +0100
> +
> +freevo (1.9.0-6) unstable; urgency=low
> +
> +  * fix Problem running imdb plugin from command line,
> +    thanks to Alessio Treglia (Closes: #511313).
> +  * add a pyversions (>= 2.5) to avoid python-compile with Python 2.4
> +    (for people upgrading from lenny)
> +  * properly use all of the patch from svn11648
> +
> + -- A Mennucc1 <mennucc1@debian.org>  Wed, 29 Sep 2010 21:43:02 +0200
> +
>  freevo (1.9.0-5) unstable; urgency=low
>  
>    * [INTL:da] Danish translation of the debconf templates freevo,
> diff -Nru freevo-1.9.0/debian/control freevo-1.9.0/debian/control
> --- freevo-1.9.0/debian/control	2010-08-11 16:07:59.000000000 +0200
> +++ freevo-1.9.0/debian/control	2010-12-27 23:50:50.000000000 +0100
> @@ -4,7 +4,7 @@
>  Maintainer: Freevo Debian Dream Team <pkg-freevo-maint@lists.alioth.debian.org>
>  Uploaders: Georg W. Leonhardt <leonhardt@geole.info>, A Mennucc1 <mennucc1@debian.org>
>  Build-Depends-Indep: po-debconf
> -Build-Depends: cdbs (>= 0.4.48), python-all (>= 2.5), python-support, debhelper (>= 5.0.38), quilt, docbook
> +Build-Depends: cdbs (>= 0.4.48), python-support (>= 0.90.0), python2.5, python2.6, debhelper (>= 5.0.38), quilt, docbook
>  Standards-Version: 3.9.1.0
>  Vcs-Svn: svn://svn.debian.org/svn/pkg-freevo/packages/freevo/trunk/
>  Vcs-Browser: http://svn.debian.org/wsvn/pkg-freevo/packages/freevo/trunk/
> @@ -12,7 +12,7 @@
>  
>  Package: freevo
>  Architecture: all
> -Depends:  ${misc:Depends}, ${python:Depends},  python-freevo (= ${binary:Version}), freevo-data (= ${binary:Version}),  mplayer, lsdvd, console-tools | kbd, debconf, adduser, xinit
> +Depends:  ${misc:Depends}, python-support (>= 0.90.0), ${python:Depends}, python-freevo (= ${binary:Version}), freevo-data (= ${binary:Version}),  mplayer, lsdvd, console-tools | kbd, debconf, adduser, xinit
>  Recommends: cdparanoia, xine-ui, xmltv-util, libxmltv-perl
>  Suggests: mencoder, libdvdcss2, lame, ttf-liberation | ttf-mscorefonts-installer, fbxine, flac, vorbis-tools, fbset, matrox-tools, nvram-wakeup
>  Description: home theater framework - binaries
> @@ -28,7 +28,8 @@
>  Package: python-freevo
>  Architecture: all
>  Section: python
> -Depends: ${misc:Depends}, ${python:Depends},  python-alsaaudio, python-libxml2, python-beautifulsoup (>= 3.0.1), python-html5lib, python-kaa-imlib2 (>= 0.2.2), python-kaa-metadata (>= 0.7.1), python-kaa-base (>= 0.4.0), python-pygame (>> 1.7.1release-4.1+b1), python-imaging, python-twisted (>= 2.5.0), python-sqlite
> +Depends: ${misc:Depends}, python-support (>= 0.90.0), ${python:Depends}, python-alsaaudio, python-libxml2, python-beautifulsoup (>= 3.0.1), python-html5lib, python-kaa-imlib2 (>= 0.2.2), python-kaa-metadata (>= 0.7.1), python-kaa-base (>= 0.4.0), python-pygame (>> 1.7.1release-4.1+b1), python-imaging, python-twisted (>= 2.5.0), python-sqlite
> +Recommends: freevo (= ${binary:Version})
>  Description: home theater framework - Python modules
>   Freevo is a complete home theater framework. It can operate as a
>   Personal Video Recorder system for saving television input to disk, but
> diff -Nru freevo-1.9.0/debian/freevo.default freevo-1.9.0/debian/freevo.default
> --- freevo-1.9.0/debian/freevo.default	2008-01-24 18:25:16.000000000 +0100
> +++ freevo-1.9.0/debian/freevo.default	2010-12-27 23:38:28.000000000 +0100
> @@ -6,12 +6,12 @@
>  #  and know what you are doing
>  
>  # Cache dir. Warning: it will be 'rm -rf' on package purge
> -export FREEVO_CACHEDIR=/home/freevo/cache
> +export FREEVO_CACHEDIR=/var/lib/freevo/cache
>  
> -export FREEVO_LOGDIR=/home/freevo/log
> +export FREEVO_LOGDIR=/var/lib/freevo/log
>  
>  #this is where record_schedule.xml is stored
> -export FREEVO_STATICDIR=/home/freevo/static
> +export FREEVO_STATICDIR=/var/lib/freevo/static
>  
>  
>  ########
> diff -Nru freevo-1.9.0/debian/freevo-lirc.postinst freevo-1.9.0/debian/freevo-lirc.postinst
> --- freevo-1.9.0/debian/freevo-lirc.postinst	2007-03-08 21:21:08.000000000 +0100
> +++ freevo-1.9.0/debian/freevo-lirc.postinst	2010-12-28 09:12:02.000000000 +0100
> @@ -8,7 +8,7 @@
>      configure)
>          if [ ! -f $LIRCRC ]; then 
>              if [ -f $LIRCD ]; then
> -                /usr/bin/freevo makelircrc -w; 
> +                echo 'You may need to call "/usr/bin/freevo makelircrc"'
>              fi
>          fi
>      ;;
> diff -Nru freevo-1.9.0/debian/freevo.postinst freevo-1.9.0/debian/freevo.postinst
> --- freevo-1.9.0/debian/freevo.postinst	2008-10-25 13:58:43.000000000 +0200
> +++ freevo-1.9.0/debian/freevo.postinst	2010-12-27 23:34:09.000000000 +0100
> @@ -154,7 +154,7 @@
>            # creating user
>  	  if ! getent passwd freevo > /dev/null ; then
>  	    echo "Adding user  'freevo'." 1>&2
> -	    adduser --ingroup freevo --quiet --home /home/freevo \
> +	    adduser --ingroup freevo --quiet --home /var/lib/freevo \
>  	        --disabled-login --system freevo
>  	  fi
>  	  for a in cdrom audio plugdev ; do
> diff -Nru freevo-1.9.0/debian/freevo.templates freevo-1.9.0/debian/freevo.templates
> --- freevo-1.9.0/debian/freevo.templates	2009-08-25 22:33:40.000000000 +0200
> +++ freevo-1.9.0/debian/freevo.templates	2010-12-27 23:42:32.000000000 +0100
> @@ -46,7 +46,7 @@
>   This will be displayed by Freevo in overview.
>  
>  Template: freevo/path_to_video
> -_Default: /home/freevo/video
> +Default: /var/lib/freevo/video
>  Type: string
>  _Description: Path to videos:
>   Please choose the directory where video files are stored.
> @@ -62,7 +62,7 @@
>   This will be displayed by Freevo in overview.
>  
>  Template: freevo/path_to_audio
> -_Default: /home/freevo/audio
> +Default: /var/lib/freevo/audio
>  Type: string
>  _Description: Path to audio folder:
>   Please choose the directory where audio files are stored.
> @@ -78,7 +78,7 @@
>   This will be displayed by Freevo in overview.
>  
>  Template: freevo/path_to_image
> -_Default: /home/freevo/image
> +Default: /var/lib/freevo/image
>  Type: string
>  _Description: Path to image folder:
>   Please choose the directory where image files are stored.
> @@ -86,7 +86,7 @@
>   You must use an absolute path (with a leading "/" character).
>  
>  Template: freevo/path_to_recordings
> -_Default: /home/freevo/recordings
> +Default: /var/lib/freevo/recordings
>  Type: string
>  _Description: Path to recorded video folder:
>   Please choose the directory where video recording files are stored.
> diff -Nru freevo-1.9.0/debian/NEWS freevo-1.9.0/debian/NEWS
> --- freevo-1.9.0/debian/NEWS	2010-02-05 15:50:28.000000000 +0100
> +++ freevo-1.9.0/debian/NEWS	2010-12-28 09:58:57.000000000 +0100
> @@ -1,3 +1,23 @@
> +freevo (1.9.0-8) unstable; urgency=low
> +
> +  * When installing freevo, it adds a user 'freevo' to the system.
> +    In older versions of freevo, the home directory was set to '/home/freevo' ;
> +    from this version on, it is '/var/lib/freevo' (see bug 608035).
> +    When upgrading freevo from older versions, the situation is complex:
> +     - the home directory is left unchanged, .i.e. '/home/freevo' still contains
> +       music, images, TV recordings (in that respect, all will work as before);
> +       if you want to change that, use 'dpkg-reconfigure freevo'.
> +     - But the directories /var/lib/freevo/cache /var/lib/freevo/log
> +       /var/lib/freevo/static are created and used instead of
> +       /home/freevo/cache , /home/freevo/log , /home/freevo/static
> +    This leaves some data in /home/freevo totally unused. You have to ways out.
> +    1) edit /etc/default/freevo so that FREEVO_CACHEDIR FREEVO_LOGDIR FREEVO_STATICDIR
> +       point to /home/freevo/cache , /home/freevo/log , /home/freevo/static
> +    2) move the data from /home/freevo/cache , /home/freevo/log , /home/freevo/static
> +      to /var/lib/freevo/cache /var/lib/freevo/log /var/lib/freevo/static
> +  
> + -- A Mennucc1 <mennucc1@debian.org>  Tue, 28 Dec 2010 09:58:54 +0100
> +
>  freevo (1.8.0-1) unstable; urgency=low
>  
>      A significant change to the TV recording has been the replacement of the
> diff -Nru freevo-1.9.0/debian/patches/force-python2.5.diff freevo-1.9.0/debian/patches/force-python2.5.diff
> --- freevo-1.9.0/debian/patches/force-python2.5.diff	1970-01-01 01:00:00.000000000 +0100
> +++ freevo-1.9.0/debian/patches/force-python2.5.diff	2010-12-28 10:23:25.000000000 +0100
> @@ -0,0 +1,20 @@
> +Index: freevo-1.9.0/freevo
> +===================================================================
> +--- freevo-1.9.0.orig/freevo	2010-12-28 10:22:28.000000000 +0100
> ++++ freevo-1.9.0/freevo	2010-12-28 10:22:37.000000000 +0100
> +@@ -177,6 +177,15 @@
> +     """
> +     get the newest version of python [ with freevo installed ]
> +     """
> ++    #A.M.: this version of Freevo does not work with "the newest version" e.g. 2.7,
> ++    #it needs python2.5 or 2.6
> ++    p='2.5'
> ++    if os.path.exists('/usr/bin/python2.6'):
> ++        p='2.6'
> ++    if check_freevo: 
> ++        return '/usr/bin/python'+p, '/usr/lib/pymodules/python'+p+'/freevo'
> ++    else:
> ++        return '/usr/bin/python'+p
> +     _debug_('version=%r' % (sys.version))
> +     if sys.hexversion >= 0x02040000:
> +         # python seems to be ok
> diff -Nru freevo-1.9.0/debian/patches/series freevo-1.9.0/debian/patches/series
> --- freevo-1.9.0/debian/patches/series	2010-08-10 17:22:32.000000000 +0200
> +++ freevo-1.9.0/debian/patches/series	2010-12-24 23:14:47.000000000 +0100
> @@ -14,3 +14,5 @@
>  imdb-html5lib.patch
>  twisted-web-9.diff
>  exit_0_if_running.diff
> +force-python2.5.diff
> +svn11693-py2.6-exceptions.diff
> diff -Nru freevo-1.9.0/debian/patches/svn11693-py2.6-exceptions.diff freevo-1.9.0/debian/patches/svn11693-py2.6-exceptions.diff
> --- freevo-1.9.0/debian/patches/svn11693-py2.6-exceptions.diff	1970-01-01 01:00:00.000000000 +0100
> +++ freevo-1.9.0/debian/patches/svn11693-py2.6-exceptions.diff	2010-12-24 23:17:36.000000000 +0100
> @@ -0,0 +1,77 @@
> +#URL: http://sourceforge.net/tracker/?func=detail&aid=3055864&group_id=46652&atid=446895
> +#Author: charrea6
> +#Comment: Fixed string exceptions not allowed in Python 2.6 (B#3055864)
> +Index: freevo/src/osd.py
> +===================================================================
> +--- freevo/src/osd.py	(revisione 11692)
> ++++ freevo/src/osd.py	(revisione 11693)
> +@@ -864,7 +864,7 @@
> +                 if cache:
> +                     cache[url] = image
> +         else:
> +-            raise 'wrong image type%r' % url
> ++            raise Exception('wrong image type%r' % url)
> + 
> +         # convert the surface to speed up blitting later
> +         if image:
> +Index: freevo/src/util/Rendezvous.py
> +===================================================================
> +--- freevo/src/util/Rendezvous.py	(revisione 11692)
> ++++ freevo/src/util/Rendezvous.py	(revisione 11693)
> +@@ -543,9 +543,9 @@
> +                     next = self.offset + 1
> +                 self.offset = ((len & 0x3F) << 8) | ord(self.data[self.offset])
> +                 if self.offset >= first:
> +-                    raise "Bad domain name (circular) at " + str(hex(self.offset))
> ++                    raise Exception("Bad domain name (circular) at " + str(hex(self.offset)))
> +             else:
> +-                raise "Bad domain name at " + str(hex(self.offset))
> ++                raise Exception("Bad domain name at " + str(hex(self.offset)))
> + 
> +         if next >= 0:
> +             self.offset = next
> +Index: freevo/src/util/marmalade.py
> +===================================================================
> +--- freevo/src/util/marmalade.py	(revisione 11692)
> ++++ freevo/src/util/marmalade.py	(revisione 11693)
> +@@ -191,7 +191,7 @@
> +                                             im_self,
> +                                             im_class)
> +             else:
> +-                raise "instance method changed"
> ++                raise Exception("instance method changed")
> +         elif node.tagName == "tuple":
> +             l = []
> +             tupFunc = tuple
> +@@ -217,7 +217,7 @@
> +                     if keyMode:
> +                         kvd = _DictKeyAndValue(d)
> +                         if not subnode.getAttribute("role") == "key":
> +-                            raise "Unjellying Error: key role not set"
> ++                            raise Exception("Unjellying Error: key role not set")
> +                         self.unjellyInto(kvd, 0, subnode)
> +                     else:
> +                         self.unjellyInto(kvd, 1, subnode)
> +@@ -250,7 +250,7 @@
> +                 lambda result, _l: apply(_l, result), nodefunc)
> +             retval = loaddef
> +         else:
> +-            raise "Unsupported Node Type: %s" % str(node.tagName)
> ++            raise Exception("Unsupported Node Type: %s" % str(node.tagName))
> +         if node.hasAttribute("reference"):
> +             refkey = node.getAttribute("reference")
> +             ref = self.references.get(refkey)
> +@@ -395,11 +395,11 @@
> +                     elif hasattr(obj, "__dict__"):
> +                         state = obj.__dict__
> +                     else:
> +-                        raise "Unsupported type: %s %s" % (objType.__name__, repr(obj))
> ++                        raise Exception("Unsupported type: %s %s" % (objType.__name__, repr(obj)))
> +                     n = self.jellyToNode(state)
> +                     node.appendChild(n)
> +             else:
> +-                raise "Unsupported type: %s" % objType.__name__
> ++                raise Exception("Unsupported type: %s" % objType.__name__)
> +         return node
> + 
> +     def jelly(self, obj):
> diff -Nru freevo-1.9.0/debian/patches/twisted-web-9.diff freevo-1.9.0/debian/patches/twisted-web-9.diff
> --- freevo-1.9.0/debian/patches/twisted-web-9.diff	2010-01-31 12:53:12.000000000 +0100
> +++ freevo-1.9.0/debian/patches/twisted-web-9.diff	2010-12-23 19:59:02.000000000 +0100
> @@ -1,5 +1,56 @@
>  #Bug: http://sourceforge.net/tracker/?func=detail&aid=2936634&group_id=46652&atid=446895
>  #Author: A Mennucc
> +--- x/src/www/htdocs/vlcwin.rpy	(revision 11647)
> ++++ x/src/www/htdocs/vlcwin.rpy	(revision 11648)
> +@@ -33,9 +33,9 @@
> + import time
> + 
> + from www.web_types import HTMLResource, FreevoResource
> +-from twisted.web.woven import page
> ++
> ++import config
> + import util
> +-import config
> + import kaa.metadata as metadata
> + from twisted.web import static
> + 
> +Index: x/src/www/htdocs/proginfo.rpy
> +===================================================================
> +--- x/src/www/htdocs/proginfo.rpy	(revision 11647)
> ++++ x/src/www/htdocs/proginfo.rpy	(revision 11648)
> +@@ -33,7 +33,6 @@
> + import time
> + 
> + from www.web_types import HTMLResource, FreevoResource
> +-from twisted.web.woven import page
> + 
> + import util.tv_util as tv_util
> + import util
> +Index: x/src/www/htdocs/guidechannel.rpy
> +===================================================================
> +--- x/src/www/htdocs/guidechannel.rpy	(revision 11647)
> ++++ x/src/www/htdocs/guidechannel.rpy	(revision 11648)
> +@@ -33,7 +33,6 @@
> + import time
> + import datetime
> + 
> +-from twisted.web.woven import page
> + from twisted.web import static
> + 
> + import util.tv_util as tv_util
> +Index: x/src/www/htdocs/fileinfo.rpy
> +===================================================================
> +--- x/src/www/htdocs/fileinfo.rpy	(revision 11647)
> ++++ x/src/www/htdocs/fileinfo.rpy	(revision 11648)
> +@@ -32,8 +32,6 @@
> + import sys, os, stat, string, urllib
> + import time
> + 
> +-from www.web_types import HTMLResource, FreevoResource
> +-from twisted.web.woven import page
> + import util
> + import config
> + import kaa.metadata as metadata
>  --- x/src/www/web_types.py.orig	2010-01-21 23:11:54.930969214 +0100
>  +++ x/src/www/web_types.py	2010-01-21 23:23:34.342726782 +0100
>  @@ -36,7 +36,6 @@
> @@ -34,8 +85,8 @@
>   class FreevoResource(Resource):
>       """
>       Base class of webpages which handels the authentication.
> ---- freevo/src/www/htdocs/guide.rpy~	2009-02-19 18:59:44.000000000 +0100
> -+++ freevo/src/www/htdocs/guide.rpy	2010-01-21 23:29:00.274594734 +0100
> +--- x/src/www/htdocs/guide.rpy~	2009-02-19 18:59:44.000000000 +0100
> ++++ x/src/www/htdocs/guide.rpy	2010-01-21 23:29:00.274594734 +0100
>  @@ -32,7 +32,6 @@
>   import sys, string
>   import time
> diff -Nru freevo-1.9.0/debian/po/cs.po freevo-1.9.0/debian/po/cs.po
> --- freevo-1.9.0/debian/po/cs.po	2009-07-18 12:47:42.000000000 +0200
> +++ freevo-1.9.0/debian/po/cs.po	2010-12-27 23:47:48.000000000 +0100
> @@ -8,10 +8,11 @@
>  msgstr ""
>  "Project-Id-Version: freevo\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2009-07-04 09:31+0200\n"
>  "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
>  "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
> +"Language: cs\n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=UTF-8\n"
>  "Content-Transfer-Encoding: 8bit\n"
> @@ -200,20 +201,14 @@
>  msgstr "Tento n??zev se zobraz?? v p??ehledu Freevo."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/video"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "Cesta ke slo??ce s videem:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr "Zadejte slo??ku, ve kter?? jsou ulo??ena videa."
>  
> @@ -225,8 +220,8 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
>  msgstr "Mus??te pou????t absolutn?? cestu (za????n?? znakem ???/???)."
>  
> @@ -249,20 +244,14 @@
>  msgstr "Zvolte n??zev slo??ky s audiem."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/audio"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "Cesta ke slo??ce s audiem:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr "Zadejte slo??ku, ve kter?? jsou ulo??eny hudebn?? soubory."
>  
> @@ -285,38 +274,26 @@
>  msgstr "Zvolte n??zev slo??ky s obr??zky."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/image"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "Cesta ke slo??ce s obr??zky:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr "Zadejte slo??ku, ve kter?? jsou ulo??eny obr??zky."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/recordings"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "Cesta ke slo??ce s nahran??m videem:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr "Zadejte slo??ku, ve kter?? jsou ulo??ena nahran?? videa."
>  
> @@ -374,6 +351,18 @@
>  msgid "Please choose the services you wish to start on boot."
>  msgstr "Zvolte si slu??by, kter?? se maj?? spou??t??t p??i zav??d??n??."
>  
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/video"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/audio"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/image"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/recordings"
> +
>  #~ msgid "x11, fbdev, dxr3, mga, directfb, dfbmga, dga"
>  #~ msgstr "x11, fbdev, dxr3, mga, directfb, dfbmga, dga"
>  
> diff -Nru freevo-1.9.0/debian/po/da.po freevo-1.9.0/debian/po/da.po
> --- freevo-1.9.0/debian/po/da.po	2010-08-10 14:40:35.000000000 +0200
> +++ freevo-1.9.0/debian/po/da.po	2010-12-27 23:47:48.000000000 +0100
> @@ -8,10 +8,11 @@
>  msgstr ""
>  "Project-Id-Version: freevo\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2010-07-11 17:34+0000\n"
>  "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
>  "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
> +"Language: da\n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=UTF-8\n"
>  "Content-Transfer-Encoding: 8bit\n"
> @@ -42,9 +43,9 @@
>  "should be configured as 768x576 (NTSC or PAL). HD television systems use "
>  "1280x720, and FullHD uses 1920x1080."
>  msgstr ""
> -"V??lg venligst opl??sningen til brug med Freevo. De fleste CRT-fjernsynssystemer "
> -"skal v??re konfigureret som 768x576 (NTSC eller PAL). HD-fjernsynssystemer bruger "
> -"1280x720, og FullHD bruger 1920x1080."
> +"V??lg venligst opl??sningen til brug med Freevo. De fleste CRT-"
> +"fjernsynssystemer skal v??re konfigureret som 768x576 (NTSC eller PAL). HD-"
> +"fjernsynssystemer bruger 1280x720, og FullHD bruger 1920x1080."
>  
>  #. Type: select
>  #. Description
> @@ -61,8 +62,8 @@
>  "Africa and the Middle East; and PAL elsewhere."
>  msgstr ""
>  "V??lg venligst tv-standarden der skal bruges. NTSC bruges i Nordamerika, det "
> -"meste af Sydamerika, og Japan; SECAM i Frankrig, det tidligere Sovjetunionen, "
> -"og dele af Afrika og Mellem??sten; ??vrige steder PAL."
> +"meste af Sydamerika, og Japan; SECAM i Frankrig, det tidligere "
> +"Sovjetunionen, og dele af Afrika og Mellem??sten; ??vrige steder PAL."
>  
>  #. Type: select
>  #. Choices
> @@ -199,20 +200,14 @@
>  msgstr "Dette vil blive vist af Freevo i oversigten."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/video"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "Sti til videoer:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr "V??lg venligst mappen hvor videofiler gemmes."
>  
> @@ -224,8 +219,8 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
>  msgstr "Du skal bruge en fast sti (med det foranf??rte tegn ??/??)."
>  
> @@ -248,20 +243,14 @@
>  msgstr "V??lg venligst titlen p?? lydmappen."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/lyd"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "Sti til lydmappe:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr "V??lg venligt mappen hvor lydfilerne er gemt."
>  
> @@ -284,38 +273,26 @@
>  msgstr "V??lg venligst titlen p?? billedmappen."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/billeder"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "Sti til billedmappe:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr "V??lg venligst mappen hvor billedfiler gemmes."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/optagelser"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "Sti til mappe for optaget video:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr "V??lg venligst mappen hvor optagede videofiler gemmes."
>  
> @@ -372,3 +349,15 @@
>  #: ../freevo.templates:13002
>  msgid "Please choose the services you wish to start on boot."
>  msgstr "V??lg venligst tjenesterne du ??nsker at starte ved opstart."
> +
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/video"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/lyd"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/billeder"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/optagelser"
> diff -Nru freevo-1.9.0/debian/po/de.po freevo-1.9.0/debian/po/de.po
> --- freevo-1.9.0/debian/po/de.po	2010-01-23 19:47:53.000000000 +0100
> +++ freevo-1.9.0/debian/po/de.po	2010-12-27 23:47:48.000000000 +0100
> @@ -9,10 +9,11 @@
>  msgstr ""
>  "Project-Id-Version: freevo-1.9.0\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2009-08-27 21:35+0200\n"
>  "Last-Translator: Thomas Mueller <thomas.mueller@tmit.eu>\n"
>  "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
> +"Language: de\n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=UTF-8\n"
>  "Content-Transfer-Encoding: 8bit\n"
> @@ -46,8 +47,8 @@
>  "1280x720, and FullHD uses 1920x1080."
>  msgstr ""
>  "Bitte w??hlen Sie die Aufl??sung, welche Freevo nutzen soll. Die meisten "
> -"R??hrenfernseher verwenden eine Aufl??sung von 768x576 (NTSC oder PAL). "
> -"HD-Fernseher verwenden 1290x720 und FullHD-Fernseher verwenden 1920x1080."
> +"R??hrenfernseher verwenden eine Aufl??sung von 768x576 (NTSC oder PAL). HD-"
> +"Fernseher verwenden 1290x720 und FullHD-Fernseher verwenden 1920x1080."
>  
>  #. Type: select
>  #. Description
> @@ -63,10 +64,10 @@
>  "South America, and Japan; SECAM in France, the former USSR, and parts of "
>  "Africa and the Middle East; and PAL elsewhere."
>  msgstr ""
> -"Bitte w??hlen Sie den TV-Standard aus, der verwendet werden soll. NTSC kommt in "
> -"Nordamerika, Teilen von S??damerika und Japan zu Einsatz; SECAM in Frankreich, "
> -"in der ehemaligen UdSSR und teilweise in Afrika und im Mittleren Osten und PAL "
> -"??berall sonst."
> +"Bitte w??hlen Sie den TV-Standard aus, der verwendet werden soll. NTSC kommt "
> +"in Nordamerika, Teilen von S??damerika und Japan zu Einsatz; SECAM in "
> +"Frankreich, in der ehemaligen UdSSR und teilweise in Afrika und im Mittleren "
> +"Osten und PAL ??berall sonst."
>  
>  #. Type: select
>  #. Choices
> @@ -171,8 +172,8 @@
>  "Please choose the channel list (set of tuning frequencies) that most closely "
>  "matches the one used in your country."
>  msgstr ""
> -"Bitte w??hlen Sie die Kanalliste (Zusammensetzung von Empfangsfrequenzen), die "
> -"am besten der entspricht, die in Ihrer Region genutzt wird."
> +"Bitte w??hlen Sie die Kanalliste (Zusammensetzung von Empfangsfrequenzen), "
> +"die am besten der entspricht, die in Ihrer Region genutzt wird."
>  
>  #. Type: select
>  #. Default
> @@ -203,22 +204,18 @@
>  msgstr "Dieser wird von Freevo in der ??bersicht angezeigt."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/filme"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "Pfad zum Video-Ordner:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
> -msgstr "Bitte w??hlen Sie den Ordner, in dem die Videodateien gespeichert werden sollen."
> +msgstr ""
> +"Bitte w??hlen Sie den Ordner, in dem die Videodateien gespeichert werden "
> +"sollen."
>  
>  #. Type: string
>  #. Description
> @@ -228,10 +225,11 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
> -msgstr "Sie m??ssen einen absoluten Pfad benutzen (mit einem f??hrenden ??/?? Zeichen)."
> +msgstr ""
> +"Sie m??ssen einen absoluten Pfad benutzen (mit einem f??hrenden ??/?? Zeichen)."
>  
>  #. Type: string
>  #. Default
> @@ -252,22 +250,18 @@
>  msgstr "Bitte w??hlen Sie den Namen des Audio-Ordner."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/musik"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "Pfad zum Audio-Ordner:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
> -msgstr "Bitte w??hlen Sie den Ordner, in dem die Audiodateien gespeichert werden sollen."
> +msgstr ""
> +"Bitte w??hlen Sie den Ordner, in dem die Audiodateien gespeichert werden "
> +"sollen."
>  
>  #. Type: string
>  #. Default
> @@ -288,38 +282,28 @@
>  msgstr "Bitte w??hlen Sie den Namen des Bilderordners."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/bilder"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "Pfad zum Bilderordner:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
> -msgstr "Bitte w??hlen Sie den Ordner, in dem die Bilddateien gespeichert werden sollen."
> -
> -#. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/aufnahmen"
> +msgstr ""
> +"Bitte w??hlen Sie den Ordner, in dem die Bilddateien gespeichert werden "
> +"sollen."
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "Pfad zum Aufnameordner:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr ""
>  "Bitte w??hlen Sie den Ordner, in dem die Videoaufnahmedateien gespeichert "
> @@ -370,13 +354,25 @@
>  "launched at the same time."
>  msgstr ""
>  "Freevo kann automatisch beim Booten des Systems gestartet werden, mit Hilfe "
> -"eines eigenst??ndigen X-Server. Web-, Encoding-, RSS- sowie der Aufnahmeserver "
> -"k??nnen zum selben Zeitpunkt gestartet werden."
> +"eines eigenst??ndigen X-Server. Web-, Encoding-, RSS- sowie der "
> +"Aufnahmeserver k??nnen zum selben Zeitpunkt gestartet werden."
>  
>  #. Type: multiselect
>  #. Description
>  #: ../freevo.templates:13002
>  msgid "Please choose the services you wish to start on boot."
>  msgstr ""
> -"Bitte w??hlen Sie die gew??nschten Server aus, die automatisch gestartet werden "
> -"sollen."
> +"Bitte w??hlen Sie die gew??nschten Server aus, die automatisch gestartet "
> +"werden sollen."
> +
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/filme"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/musik"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/bilder"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/aufnahmen"
> diff -Nru freevo-1.9.0/debian/po/es.po freevo-1.9.0/debian/po/es.po
> --- freevo-1.9.0/debian/po/es.po	2009-07-18 12:47:42.000000000 +0200
> +++ freevo-1.9.0/debian/po/es.po	2010-12-27 23:47:48.000000000 +0100
> @@ -31,10 +31,11 @@
>  msgstr ""
>  "Project-Id-Version: freevo 1.9.0-2\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2009-06-30 09:12+0100\n"
>  "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
>  "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
> +"Language: \n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=UTF-8\n"
>  "Content-Transfer-Encoding: 8bit\n"
> @@ -224,20 +225,14 @@
>  msgstr "Freevo lo mostrar?? en una visi??n general."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/video"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "Ruta a los v??deos:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr "Escoja el directorio en el que se guardar??n los archivos de v??deo."
>  
> @@ -249,8 +244,8 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
>  msgstr "Debe utilizar una ruta absoluta (con el car??cter ??/?? al inicio)."
>  
> @@ -273,20 +268,14 @@
>  msgstr "Escoja el t??tulo del directorio de audio."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/audio"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "Ruta al directorio de audio:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr "Escoja el directorio en el que se guardar??n los archivos de audio."
>  
> @@ -309,38 +298,26 @@
>  msgstr "Escoja el t??tulo del directorio de las im??genes."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/image"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "Ruta al directorio de las im??genes:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr "Escoja el directorio en el que se guardar??n los archivos de im??genes."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/recordings"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "Ruta al directorio de grabaciones de v??deo:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr ""
>  "Escoja el directorio en el que se guardar??n los archivos de v??deo grabado."
> @@ -399,6 +376,18 @@
>  msgid "Please choose the services you wish to start on boot."
>  msgstr "Escoja los servicios que quiere iniciar en el arranque."
>  
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/video"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/audio"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/image"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/recordings"
> +
>  #~ msgid "x11, fbdev, dxr3, mga, directfb, dfbmga, dga"
>  #~ msgstr "x11, fbdev, dxr3, mga, directfb, dfbmga, dga"
>  
> diff -Nru freevo-1.9.0/debian/po/eu.po freevo-1.9.0/debian/po/eu.po
> --- freevo-1.9.0/debian/po/eu.po	2009-07-18 12:47:42.000000000 +0200
> +++ freevo-1.9.0/debian/po/eu.po	2010-12-27 23:47:48.000000000 +0100
> @@ -7,10 +7,11 @@
>  msgstr ""
>  "Project-Id-Version: freevo-eu\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2009-06-29 09:59+0200\n"
>  "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
>  "Language-Team: Euskara <debian-l10n-eu@lists.debian.org>\n"
> +"Language: \n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=UTF-8\n"
>  "Content-Transfer-Encoding: 8bit\n"
> @@ -201,20 +202,14 @@
>  msgstr "Berau bistaraziko du Freevo-k abioan."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/bideoa"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "Bidea bideoetara:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr "Mesedez hautatu bideoak biltegiratzeko direktorioa."
>  
> @@ -226,8 +221,8 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
>  msgstr "Bide osoa erabili behar duzu (hasierako \"/\" ikurrarekin)"
>  
> @@ -250,20 +245,14 @@
>  msgstr "Mesedez hautatu audio karpetaren izenburua."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/audioa"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "Bidea audio karpetara:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr "Mesedez hautatu audio fitxategiak biltegiratzeko karpeta."
>  
> @@ -286,38 +275,26 @@
>  msgstr "Mesedez hautatu irudi karpetaren izenburua."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/irudiak"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "Bidea irudi karpetara:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr "Mesedez hautatu irudi fitxategiak biltegiratzeko karpeta."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/grabaketak"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "Bidea grabatutako bideo karpetara:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr "Mesedez hautatu grabatutako bideoak biltegiratzeko karpeta."
>  
> @@ -374,3 +351,15 @@
>  #: ../freevo.templates:13002
>  msgid "Please choose the services you wish to start on boot."
>  msgstr "Mesedez hautatu sistemanabioan abiarazi nahi dituzun zerbitzuak."
> +
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/bideoa"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/audioa"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/irudiak"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/grabaketak"
> diff -Nru freevo-1.9.0/debian/po/fi.po freevo-1.9.0/debian/po/fi.po
> --- freevo-1.9.0/debian/po/fi.po	2009-07-18 12:47:42.000000000 +0200
> +++ freevo-1.9.0/debian/po/fi.po	2010-12-27 23:47:48.000000000 +0100
> @@ -6,10 +6,11 @@
>  msgstr ""
>  "Project-Id-Version: freevo\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2009-06-29 22:53+0300\n"
>  "Last-Translator: Esko Araj??rvi <edu@iki.fi>\n"
>  "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
> +"Language: fi\n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=UTF-8\n"
>  "Content-Transfer-Encoding: 8bit\n"
> @@ -200,20 +201,14 @@
>  msgstr "T??m?? n??ytet????n Freevon yleisn??kym??ss??."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/video"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "Videoiden polku:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr "Anna sen hakemiston polku, johon videotiedostot on tallennettu."
>  
> @@ -225,8 +220,8 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
>  msgstr "K??yt?? t??ydellist?? (merkill?? ???/??? alkavaa) polkua."
>  
> @@ -249,20 +244,14 @@
>  msgstr "Anna otsikko ????nihakemistolle."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/audio"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "????nihakemiston polku:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr "Anna sen hakemiston polku, johon ????nitiedostot on tallennettu."
>  
> @@ -285,38 +274,26 @@
>  msgstr "Anna otsikko kuvahakemistolle."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/image"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "Kuvahakemiston polku:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr "Anna sen hakemiston polku, johon kuvatiedostot on tallennettu."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/recordings"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "Nauhoitettujen videoiden hakemisto:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr "Anna hakemisto, johon nauhoitetut videotiedostot tallennetaan."
>  
> @@ -373,3 +350,15 @@
>  #: ../freevo.templates:13002
>  msgid "Please choose the services you wish to start on boot."
>  msgstr "Valitse palvelut, jotka k??ynnistet????n j??rjestelm??n k??ynnistyess??."
> +
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/video"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/audio"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/image"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/recordings"
> diff -Nru freevo-1.9.0/debian/po/fr.po freevo-1.9.0/debian/po/fr.po
> --- freevo-1.9.0/debian/po/fr.po	2009-07-18 12:47:42.000000000 +0200
> +++ freevo-1.9.0/debian/po/fr.po	2010-12-27 23:47:48.000000000 +0100
> @@ -7,10 +7,11 @@
>  msgstr ""
>  "Project-Id-Version: freevo 1.8.0~rc2-1\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2008-02-26 20:42+0100\n"
>  "Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\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"
> @@ -199,20 +200,14 @@
>  msgstr "Celui-ci sera affich?? par Freevo en surimpression."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/video"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "Chemin vers les vid??os??:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr ""
>  "Veuillez choisir le chemin vers le r??pertoire contenant les fichiers vid??o."
> @@ -225,8 +220,8 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
>  msgstr "Vous devez utilisez un chemin absolu pour ce r??pertoire."
>  
> @@ -249,20 +244,14 @@
>  msgstr "Nom du r??pertoire audio??:"
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/audio"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "Veuillez choisir un r??pertoire pour les fichiers audio."
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr "Chemin vers le r??pertoire audio??:"
>  
> @@ -285,38 +274,26 @@
>  msgstr "Nom du r??pertoire des images??:"
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/image"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "Veuillez choisir le r??pertoire des fichiers image."
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr "Chemin vers le r??pertoire des images??:"
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/recordings"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "Veuillez choisir le r??pertoire des vid??os enregistr??es."
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr "Chemin vers le r??pertoire des vid??os enregistr??es??:"
>  
> @@ -374,6 +351,18 @@
>  msgid "Please choose the services you wish to start on boot."
>  msgstr "Veuillez choisir les services ?? d??marrer au lancement de la machine."
>  
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/video"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/audio"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/image"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/recordings"
> +
>  #~ msgid "x11, fbdev, dxr3, mga, directfb, dfbmga, dga"
>  #~ msgstr "x11, fbdev, dxr3, mga, directfb, dfbmga, dga"
>  
> diff -Nru freevo-1.9.0/debian/po/gl.po freevo-1.9.0/debian/po/gl.po
> --- freevo-1.9.0/debian/po/gl.po	2009-07-18 12:47:42.000000000 +0200
> +++ freevo-1.9.0/debian/po/gl.po	2010-12-27 23:47:48.000000000 +0100
> @@ -6,10 +6,11 @@
>  msgstr ""
>  "Project-Id-Version: freevo\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2009-07-16 21:23+0200\n"
>  "Last-Translator: Marce Villarino <mvillarino@gmail.com>\n"
>  "Language-Team: Galician <proxecto@trasno.net>\n"
> +"Language: gl\n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=UTF-8\n"
>  "Content-Transfer-Encoding: 8bit\n"
> @@ -199,20 +200,14 @@
>  msgstr "Isto mostrarao Freeo no resumo."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/video"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "Rota aos v??deos:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr "Escolla o directorio onde se gardan os ficheiros de video."
>  
> @@ -224,8 +219,8 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
>  msgstr "Debe empregar unha rota absoluta (cun car??cter ??/?? ao inicio)."
>  
> @@ -248,20 +243,14 @@
>  msgstr "Escolla o t??tulo do cartafol de son."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/audio"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "Rota ao cartafol de son:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr "Escolla o directorio onde se gardan os ficheiros de son."
>  
> @@ -284,38 +273,26 @@
>  msgstr "Escolla o t??tulo do cartafol das imaxes."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/image"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "Rota ao cartafol das imaxes:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr "Escolla o directorio onde se gardan os ficheiros de imaxe."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/recordings"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "Rota ao cartafol dos v??deos gravados:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr "Escolla o directorio onde se gardan os ficheiros de v??deos gravados."
>  
> @@ -372,3 +349,15 @@
>  #: ../freevo.templates:13002
>  msgid "Please choose the services you wish to start on boot."
>  msgstr "Escolla os servizos que desexa iniciar durante o arrinque."
> +
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/video"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/audio"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/image"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/recordings"
> diff -Nru freevo-1.9.0/debian/po/ja.po freevo-1.9.0/debian/po/ja.po
> --- freevo-1.9.0/debian/po/ja.po	2010-01-23 19:48:37.000000000 +0100
> +++ freevo-1.9.0/debian/po/ja.po	2010-12-27 23:47:48.000000000 +0100
> @@ -1,372 +1,361 @@
>  # Copyright (C) 2009 Freevo Debian Dream Team <pkg-freevo-maint@lists.alioth.debian.org>
>  # This file is distributed under the same license as the freevo package.
>  # Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009.
> -#
> -msgid ""
> -msgstr ""
> -"Project-Id-Version: freevo 1.9.0-3\n"
> -"Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> -"PO-Revision-Date: 2009-10-04 17:32+0900\n"
> -"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
> -"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
> -"MIME-Version: 1.0\n"
> -"Content-Type: text/plain; charset=UTF-8\n"
> -"Content-Transfer-Encoding: 8bit\n"
> -
> -#. Type: select
> -#. Description
> -#: ../freevo.templates:2001
> -msgid "Video output:"
> -msgstr "???????????????:"
> -
> -#. Type: select
> -#. Description
> -#: ../freevo.templates:2001
> -msgid "Please choose the type of video output to use with Freevo."
> -msgstr "Freevo ????????????????????????????????????????????????????????????"
> -
> -#. Type: select
> -#. Description
> -#: ../freevo.templates:3001
> -msgid "Output resolution:"
> -msgstr "???????????????:"
> -
> -#. Type: select
> -#. Description
> -#: ../freevo.templates:3001
> -msgid ""
> -"Please choose the resolution to use with Freevo. Most CRT television systems "
> -"should be configured as 768x576 (NTSC or PAL). HD television systems use "
> -"1280x720, and FullHD uses 1920x1080."
> -msgstr ""
> -"Freevo ???????????????????????????????????????????????????????????????????????? 768x576 (NTSC ???????????? PAL) "
> -"??????????????????????????????HD ????????????????????????????????? 1280x720????????? HD ??? 1920x1080 "
> -"??????????????????"
> -
> -#. Type: select
> -#. Description
> -#: ../freevo.templates:4001
> -msgid "TV standard:"
> -msgstr "?????????????????????:"
> -
> -#. Type: select
> -#. Description
> -#: ../freevo.templates:4001
> -msgid ""
> -"Please choose the TV standard to use. NTSC is used in North America, much of "
> -"South America, and Japan; SECAM in France, the former USSR, and parts of "
> -"Africa and the Middle East; and PAL elsewhere."
> -msgstr ""
> -"????????????????????????????????????????????????????????????NTSC ????????????????????????????????????????????????"
> -"????????????????????????????????????????????????SECAM ????????????????????????????????????????????????????????????"
> -"?????????????????????????????? PAL ???????????????????????????"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "USA broadcast"
> -msgstr "??????????????? (????????????)"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "USA cable"
> -msgstr "????????????????????? (????????????)"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "USA cable HRC"
> -msgstr "?????????????????????????????? (????????????)"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "Japan broadcast"
> -msgstr "??????????????? (??????)"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "Japan cable"
> -msgstr "????????????????????? (??????)"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "Europe (West)"
> -msgstr "??????????????? (??????)"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "Europe (East)"
> -msgstr "??????????????? (??????)"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "Italy"
> -msgstr "????????????"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "New Zealand"
> -msgstr "????????????????????????"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "Australia"
> -msgstr "?????????????????????"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "Ireland"
> -msgstr "??????????????????"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "France"
> -msgstr "????????????"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "China broadcast"
> -msgstr "??????????????? (??????)"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "South Africa"
> -msgstr "???????????????"
> -
> -#. Type: select
> -#. Choices
> -#: ../freevo.templates:5001
> -msgid "Argentina"
> -msgstr "??????????????????"
> -
> -#. Type: select
> -#. Description
> -#: ../freevo.templates:5002
> -msgid "Channel list:"
> -msgstr "?????????????????????:"
> -
> -#. Type: select
> -#. Description
> -#: ../freevo.templates:5002
> -msgid ""
> -"Please choose the channel list (set of tuning frequencies) that most closely "
> -"matches the one used in your country."
> -msgstr ""
> -"??????????????????????????????????????????????????????????????????????????????????????? (???????????????????????????) "
> -"???????????????????????????"
> -
> -#. Type: select
> -#. Default
> -#: ../freevo.templates:6001
> -msgid "Video folder"
> -msgstr "?????????????????????"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:6002
> -msgid "Title of video folder:"
> -msgstr "????????????????????????????????????:"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:6002
> -msgid "Please choose the title of the video folder."
> -msgstr "???????????????????????????????????????????????????????????????"
> -
> -#. Type: string
> -#. Description
> -#. Type: string
> -#. Description
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:6002 ../freevo.templates:8002 ../freevo.templates:10002
> -msgid "This will be displayed by Freevo in overview."
> -msgstr "????????? Freevo ?????????????????????????????????"
> -
> -#. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/video"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:7002
> -msgid "Path to videos:"
> -msgstr "????????????????????? (Path):"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:7002
> -msgid "Please choose the directory where video files are stored."
> -msgstr "????????????????????????????????????????????????????????????????????????????????????"
> -
> -#. Type: string
> -#. Description
> -#. Type: string
> -#. Description
> -#. Type: string
> -#. Description
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> -msgid "You must use an absolute path (with a leading \"/\" character)."
> -msgstr "(???/????????????????????????) ???????????????????????????????????????????????????"
> -
> -#. Type: string
> -#. Default
> -#: ../freevo.templates:8001
> -msgid "Audio folder"
> -msgstr "??????????????????"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:8002
> -msgid "Title of audio folder:"
> -msgstr "?????????????????????????????????:"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:8002
> -msgid "Please choose the title of the audio folder."
> -msgstr "????????????????????????????????????????????????????????????"
> -
> -#. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/audio"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:9002
> -msgid "Path to audio folder:"
> -msgstr "?????????????????????????????? (Path):"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:9002
> -msgid "Please choose the directory where audio files are stored."
> -msgstr "?????????????????????????????????????????????????????????????????????????????????"
> -
> -#. Type: string
> -#. Default
> -#: ../freevo.templates:10001
> -msgid "Image folder"
> -msgstr "??????????????????"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:10002
> -msgid "Title of image folder:"
> -msgstr "?????????????????????????????????:"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:10002
> -msgid "Please choose the title of the image folder."
> -msgstr "????????????????????????????????????????????????????????????"
> -
> -#. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/image"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:11002
> -msgid "Path to image folder:"
> -msgstr "?????????????????????????????? (Path):"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:11002
> -msgid "Please choose the directory where image files are stored."
> -msgstr "?????????????????????????????????????????????????????????????????????????????????"
> -
> -#. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/recordings"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:12002
> -msgid "Path to recorded video folder:"
> -msgstr "???????????????????????????????????? (Path):"
> -
> -#. Type: string
> -#. Description
> -#: ../freevo.templates:12002
> -msgid "Please choose the directory where video recording files are stored."
> -msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
> -
> -#. Type: multiselect
> -#. Choices
> -#: ../freevo.templates:13001
> -msgid "xserver"
> -msgstr "X ?????????"
> -
> -#. Type: multiselect
> -#. Choices
> -#: ../freevo.templates:13001
> -msgid "recordserver"
> -msgstr "???????????????"
> -
> -#. Type: multiselect
> -#. Choices
> -#: ../freevo.templates:13001
> -msgid "encodingserver"
> -msgstr "?????????????????????????????????"
> -
> -#. Type: multiselect
> -#. Choices
> -#: ../freevo.templates:13001
> -msgid "webserver"
> -msgstr "??????????????????"
> -
> -#. Type: multiselect
> -#. Choices
> -#: ../freevo.templates:13001
> -msgid "rssserver"
> -msgstr "rss ?????????"
> -
> -#. Type: multiselect
> -#. Description
> -#: ../freevo.templates:13002
> -msgid "Services to start during boot:"
> -msgstr "???????????????????????????????????????:"
> -
> -#. Type: multiselect
> -#. Description
> -#: ../freevo.templates:13002
> -msgid ""
> -"Freevo can be started automatically when the machine boots, using a "
> -"dedicated X server. Web, encoding, RSS, and recording servers can be "
> -"launched at the same time."
> -msgstr ""
> -"Freevo ???????????????????????????????????? X ??????????????????????????????????????????????????????"
> -"?????????????????????????????????????????????????????????????????????????????????????????????RSS ????????????"
> -"???????????????????????????????????????"
> -
> -#. Type: multiselect
> -#. Description
> -#: ../freevo.templates:13002
> -msgid "Please choose the services you wish to start on boot."
> -msgstr "??????????????????????????????????????????????????????????????????"
> +# 
> +msgid ""
> +msgstr ""
> +"Project-Id-Version: freevo 1.9.0-3\n"
> +"Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
> +"PO-Revision-Date: 2009-10-04 17:32+0900\n"
> +"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
> +"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
> +"Language: ja\n"
> +"MIME-Version: 1.0\n"
> +"Content-Type: text/plain; charset=UTF-8\n"
> +"Content-Transfer-Encoding: 8bit\n"
> +
> +#. Type: select
> +#. Description
> +#: ../freevo.templates:2001
> +msgid "Video output:"
> +msgstr "???????????????:"
> +
> +#. Type: select
> +#. Description
> +#: ../freevo.templates:2001
> +msgid "Please choose the type of video output to use with Freevo."
> +msgstr "Freevo ????????????????????????????????????????????????????????????"
> +
> +#. Type: select
> +#. Description
> +#: ../freevo.templates:3001
> +msgid "Output resolution:"
> +msgstr "???????????????:"
> +
> +#. Type: select
> +#. Description
> +#: ../freevo.templates:3001
> +msgid ""
> +"Please choose the resolution to use with Freevo. Most CRT television systems "
> +"should be configured as 768x576 (NTSC or PAL). HD television systems use "
> +"1280x720, and FullHD uses 1920x1080."
> +msgstr ""
> +"Freevo ???????????????????????????????????????????????????????????????????????? 768x576 (NTSC ?????????"
> +"??? PAL) ??????????????????????????????HD ????????????????????????????????? 1280x720????????? HD ??? "
> +"1920x1080 ??????????????????"
> +
> +#. Type: select
> +#. Description
> +#: ../freevo.templates:4001
> +msgid "TV standard:"
> +msgstr "?????????????????????:"
> +
> +#. Type: select
> +#. Description
> +#: ../freevo.templates:4001
> +msgid ""
> +"Please choose the TV standard to use. NTSC is used in North America, much of "
> +"South America, and Japan; SECAM in France, the former USSR, and parts of "
> +"Africa and the Middle East; and PAL elsewhere."
> +msgstr ""
> +"????????????????????????????????????????????????????????????NTSC ?????????????????????????????????????????????"
> +"???????????????????????????????????????????????????SECAM ??????????????????????????????????????????????????????"
> +"???????????????????????????????????? PAL ???????????????????????????"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "USA broadcast"
> +msgstr "??????????????? (????????????)"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "USA cable"
> +msgstr "????????????????????? (????????????)"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "USA cable HRC"
> +msgstr "?????????????????????????????? (????????????)"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "Japan broadcast"
> +msgstr "??????????????? (??????)"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "Japan cable"
> +msgstr "????????????????????? (??????)"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "Europe (West)"
> +msgstr "??????????????? (??????)"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "Europe (East)"
> +msgstr "??????????????? (??????)"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "Italy"
> +msgstr "????????????"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "New Zealand"
> +msgstr "????????????????????????"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "Australia"
> +msgstr "?????????????????????"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "Ireland"
> +msgstr "??????????????????"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "France"
> +msgstr "????????????"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "China broadcast"
> +msgstr "??????????????? (??????)"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "South Africa"
> +msgstr "???????????????"
> +
> +#. Type: select
> +#. Choices
> +#: ../freevo.templates:5001
> +msgid "Argentina"
> +msgstr "??????????????????"
> +
> +#. Type: select
> +#. Description
> +#: ../freevo.templates:5002
> +msgid "Channel list:"
> +msgstr "?????????????????????:"
> +
> +#. Type: select
> +#. Description
> +#: ../freevo.templates:5002
> +msgid ""
> +"Please choose the channel list (set of tuning frequencies) that most closely "
> +"matches the one used in your country."
> +msgstr ""
> +"??????????????????????????????????????????????????????????????????????????????????????? (????????????????????????"
> +"???) ???????????????????????????"
> +
> +#. Type: select
> +#. Default
> +#: ../freevo.templates:6001
> +msgid "Video folder"
> +msgstr "?????????????????????"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:6002
> +msgid "Title of video folder:"
> +msgstr "????????????????????????????????????:"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:6002
> +msgid "Please choose the title of the video folder."
> +msgstr "???????????????????????????????????????????????????????????????"
> +
> +#. Type: string
> +#. Description
> +#. Type: string
> +#. Description
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:6002 ../freevo.templates:8002 ../freevo.templates:10002
> +msgid "This will be displayed by Freevo in overview."
> +msgstr "????????? Freevo ?????????????????????????????????"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:7001
> +msgid "Path to videos:"
> +msgstr "????????????????????? (Path):"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:7001
> +msgid "Please choose the directory where video files are stored."
> +msgstr "????????????????????????????????????????????????????????????????????????????????????"
> +
> +#. Type: string
> +#. Description
> +#. Type: string
> +#. Description
> +#. Type: string
> +#. Description
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
> +msgid "You must use an absolute path (with a leading \"/\" character)."
> +msgstr "(???/????????????????????????) ???????????????????????????????????????????????????"
> +
> +#. Type: string
> +#. Default
> +#: ../freevo.templates:8001
> +msgid "Audio folder"
> +msgstr "??????????????????"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:8002
> +msgid "Title of audio folder:"
> +msgstr "?????????????????????????????????:"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:8002
> +msgid "Please choose the title of the audio folder."
> +msgstr "????????????????????????????????????????????????????????????"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:9001
> +msgid "Path to audio folder:"
> +msgstr "?????????????????????????????? (Path):"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:9001
> +msgid "Please choose the directory where audio files are stored."
> +msgstr "?????????????????????????????????????????????????????????????????????????????????"
> +
> +#. Type: string
> +#. Default
> +#: ../freevo.templates:10001
> +msgid "Image folder"
> +msgstr "??????????????????"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:10002
> +msgid "Title of image folder:"
> +msgstr "?????????????????????????????????:"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:10002
> +msgid "Please choose the title of the image folder."
> +msgstr "????????????????????????????????????????????????????????????"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:11001
> +msgid "Path to image folder:"
> +msgstr "?????????????????????????????? (Path):"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:11001
> +msgid "Please choose the directory where image files are stored."
> +msgstr "?????????????????????????????????????????????????????????????????????????????????"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:12001
> +msgid "Path to recorded video folder:"
> +msgstr "???????????????????????????????????? (Path):"
> +
> +#. Type: string
> +#. Description
> +#: ../freevo.templates:12001
> +msgid "Please choose the directory where video recording files are stored."
> +msgstr "?????????????????????????????????????????????????????????????????????????????????????????????"
> +
> +#. Type: multiselect
> +#. Choices
> +#: ../freevo.templates:13001
> +msgid "xserver"
> +msgstr "X ?????????"
> +
> +#. Type: multiselect
> +#. Choices
> +#: ../freevo.templates:13001
> +msgid "recordserver"
> +msgstr "???????????????"
> +
> +#. Type: multiselect
> +#. Choices
> +#: ../freevo.templates:13001
> +msgid "encodingserver"
> +msgstr "?????????????????????????????????"
> +
> +#. Type: multiselect
> +#. Choices
> +#: ../freevo.templates:13001
> +msgid "webserver"
> +msgstr "??????????????????"
> +
> +#. Type: multiselect
> +#. Choices
> +#: ../freevo.templates:13001
> +msgid "rssserver"
> +msgstr "rss ?????????"
> +
> +#. Type: multiselect
> +#. Description
> +#: ../freevo.templates:13002
> +msgid "Services to start during boot:"
> +msgstr "???????????????????????????????????????:"
> +
> +#. Type: multiselect
> +#. Description
> +#: ../freevo.templates:13002
> +msgid ""
> +"Freevo can be started automatically when the machine boots, using a "
> +"dedicated X server. Web, encoding, RSS, and recording servers can be "
> +"launched at the same time."
> +msgstr ""
> +"Freevo ???????????????????????????????????? X ???????????????????????????????????????????????????????????????"
> +"????????????????????????????????????????????????????????????????????????????????????RSS ????????????????????????"
> +"???????????????????????????"
> +
> +#. Type: multiselect
> +#. Description
> +#: ../freevo.templates:13002
> +msgid "Please choose the services you wish to start on boot."
> +msgstr "??????????????????????????????????????????????????????????????????"
> +
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/video"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/audio"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/image"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/recordings"
> diff -Nru freevo-1.9.0/debian/po/pt.po freevo-1.9.0/debian/po/pt.po
> --- freevo-1.9.0/debian/po/pt.po	2009-07-18 12:47:42.000000000 +0200
> +++ freevo-1.9.0/debian/po/pt.po	2010-12-27 23:47:48.000000000 +0100
> @@ -7,10 +7,11 @@
>  msgstr ""
>  "Project-Id-Version: freevo 1.9.0-2\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2009-06-29 21:18+0100\n"
>  "Last-Translator: Am??rico Monteiro <a_monteiro@netcabo.pt>\n"
>  "Language-Team: Portuguese <traduz@debianpt.org>\n"
> +"Language: pt\n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=UTF-8\n"
>  "Content-Transfer-Encoding: 8bit\n"
> @@ -199,20 +200,14 @@
>  msgstr "Isto ser?? mostrado pelo Freevo na representa????o geral."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/video"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "Caminho para v??deos:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr ""
>  "Por favor escolha o direct??rio onde os ficheiros de v??deo s??o guardados."
> @@ -225,8 +220,8 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
>  msgstr "Voc?? deve usar um caminho absoluto (com um carater \"/\" inicial)."
>  
> @@ -249,20 +244,14 @@
>  msgstr "Por favor escolha o t??tulo do direct??rio de ??udio."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/audio"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "Caminho para o direct??rio de ??udio:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr ""
>  "Por favor escolha o direct??rio onde os ficheiros de ??udio s??o guardados."
> @@ -286,39 +275,27 @@
>  msgstr "Por favor escolha o t??tulo do direct??rio de imagens."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/image"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "Caminho para o direct??rio de imagens:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr ""
>  "Por favor escolha o direct??rio onde os ficheiros de imagens s??o guardados."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/recordings"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "Caminho para o direct??rio de grava????es de v??deo:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr ""
>  "Por favor escolha o direct??rio onde os ficheiros de grava????o de v??deo s??o "
> @@ -378,3 +355,15 @@
>  msgid "Please choose the services you wish to start on boot."
>  msgstr ""
>  "Por favor escolha os servi??os que deseja iniciar no arranque do sistema."
> +
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/video"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/audio"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/image"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/recordings"
> diff -Nru freevo-1.9.0/debian/po/ru.po freevo-1.9.0/debian/po/ru.po
> --- freevo-1.9.0/debian/po/ru.po	2009-07-18 12:47:42.000000000 +0200
> +++ freevo-1.9.0/debian/po/ru.po	2010-12-27 23:47:48.000000000 +0100
> @@ -10,16 +10,17 @@
>  msgstr ""
>  "Project-Id-Version: freevo 1.8.0-3\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2009-06-29 21:03+0400\n"
>  "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
>  "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
> +"Language: ru\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"
> -"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: select
>  #. Description
> @@ -203,20 +204,14 @@
>  msgstr "???? ?????????? ???????????????????????? Freevo ?????? ?????????????????????????????? ??????????????????."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/video"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "???????? ?? ??????????:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr "?????????????? ??????????????, ?? ?????????????? ???????????????? ????????????????????."
>  
> @@ -228,8 +223,8 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
>  msgstr "???????????????????? ?????? ?? ???????? ?????????????????????? ???????? (?? \"/\" ?? ????????????)."
>  
> @@ -252,20 +247,14 @@
>  msgstr "?????????????? ?????????????????? ?????? ???????????????? ?? ??????????."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/audio"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "???????? ?? ??????????:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr "?????????????? ??????????????, ?? ?????????????? ???????????????? ????????????????????."
>  
> @@ -288,38 +277,26 @@
>  msgstr "?????????????? ?????????????????? ?????? ???????????????? ?? ??????????????????????????."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/image"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "???????? ?? ???????????????? ??????????????????????:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr "?????????????? ??????????????, ?? ?????????????? ???????????????? ?????????? ?? ??????????????????????????."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/recordings"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "???????? ?? ???????????????? ?? ???????????????????? ??????????:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr "?????????????? ??????????????, ?? ?????????????? ???????????????? ?????????? ?? ???????????????????? ??????????."
>  
> @@ -376,3 +353,15 @@
>  #: ../freevo.templates:13002
>  msgid "Please choose the services you wish to start on boot."
>  msgstr "???????????????? ????????????, ?????????????? ?????????? ?????????????????? ?????? ?????????????????? ????????????????????."
> +
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/video"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/audio"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/image"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/recordings"
> diff -Nru freevo-1.9.0/debian/po/sv.po freevo-1.9.0/debian/po/sv.po
> --- freevo-1.9.0/debian/po/sv.po	2009-07-18 12:47:42.000000000 +0200
> +++ freevo-1.9.0/debian/po/sv.po	2010-12-27 23:47:48.000000000 +0100
> @@ -8,10 +8,11 @@
>  msgstr ""
>  "Project-Id-Version: freevo\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2009-07-06 23:16+0100\n"
>  "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
>  "Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
> +"Language: \n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=UTF-8\n"
>  "Content-Transfer-Encoding: 8bit\n"
> @@ -201,20 +202,14 @@
>  "Ange en rubrik f??r videomappen. Detta kommer att visas i Freevos ??versikt."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/video"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "S??kv??g till videofiler:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr "Ange katalog d??r videofilerna ska sparas."
>  
> @@ -226,8 +221,8 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
>  msgstr "Du m??ste ange en absolut s??kv??g (med tecknet \"/\" f??rst)."
>  
> @@ -250,20 +245,14 @@
>  msgstr "Ange rubrik p?? ljudmappen."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/audio"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "S??kv??g till videokatalogen:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr "Ange katalog d??r ljudfilerna sparas."
>  
> @@ -286,38 +275,26 @@
>  msgstr "Ange rubrik p?? bildmappen."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/image"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "S??kv??g till bildkatalogen:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr "Ange katalog d??r bildfilerna sparas."
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/recordings"
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "S??kv??g till katalogen med sparade videofiler:"
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr "Ange katalog d??r videoinspelningsfilerna sparas."
>  
> @@ -375,6 +352,18 @@
>  msgid "Please choose the services you wish to start on boot."
>  msgstr "Ange de tj??nster du vill starta vid uppstarten."
>  
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/video"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/audio"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/image"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/recordings"
> +
>  #~ msgid "x11, fbdev, dxr3, mga, directfb, dfbmga, dga"
>  #~ msgstr "x11, fbdev, dxr3, mga, directfb, dfbmga, dga"
>  
> diff -Nru freevo-1.9.0/debian/po/templates.pot freevo-1.9.0/debian/po/templates.pot
> --- freevo-1.9.0/debian/po/templates.pot	2009-07-18 12:47:42.000000000 +0200
> +++ freevo-1.9.0/debian/po/templates.pot	2010-12-27 23:47:48.000000000 +0100
> @@ -8,10 +8,11 @@
>  msgstr ""
>  "Project-Id-Version: PACKAGE VERSION\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
>  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
>  "Language-Team: LANGUAGE <LL@li.org>\n"
> +"Language: \n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=CHARSET\n"
>  "Content-Transfer-Encoding: 8bit\n"
> @@ -191,20 +192,14 @@
>  msgstr ""
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:7001
> -msgid "/home/freevo/video"
> -msgstr ""
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr ""
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr ""
>  
> @@ -216,8 +211,8 @@
>  #. Description
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:7002 ../freevo.templates:9002 ../freevo.templates:11002
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
>  msgstr ""
>  
> @@ -240,20 +235,14 @@
>  msgstr ""
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:9001
> -msgid "/home/freevo/audio"
> -msgstr ""
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr ""
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:9002
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr ""
>  
> @@ -276,38 +265,26 @@
>  msgstr ""
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:11001
> -msgid "/home/freevo/image"
> -msgstr ""
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr ""
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:11002
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr ""
>  
>  #. Type: string
> -#. Default
> -#: ../freevo.templates:12001
> -msgid "/home/freevo/recordings"
> -msgstr ""
> -
> -#. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr ""
>  
>  #. Type: string
>  #. Description
> -#: ../freevo.templates:12002
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr ""
>  
> diff -Nru freevo-1.9.0/debian/po/vi.po freevo-1.9.0/debian/po/vi.po
> --- freevo-1.9.0/debian/po/vi.po	2010-01-23 19:48:37.000000000 +0100
> +++ freevo-1.9.0/debian/po/vi.po	2010-12-27 23:47:48.000000000 +0100
> @@ -6,220 +6,213 @@
>  msgstr ""
>  "Project-Id-Version: freevo 1.9.0-2\n"
>  "Report-Msgid-Bugs-To: freevo@packages.debian.org\n"
> -"POT-Creation-Date: 2009-06-29 08:26+0200\n"
> +"POT-Creation-Date: 2010-12-27 23:47+0100\n"
>  "PO-Revision-Date: 2009-09-23 00:38+0930\n"
>  "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
>  "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
> +"Language: vi\n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=UTF-8\n"
>  "Content-Transfer-Encoding: 8bit\n"
>  "Plural-Forms: nplurals=1; plural=0;\n"
>  "X-Generator: LocFactoryEditor 1.8\n"
>  
> -#: ../freevo.templates:2001
>  #. Type: select
>  #. Description
> +#: ../freevo.templates:2001
>  msgid "Video output:"
>  msgstr "K???t xu???t phim:"
>  
> -#: ../freevo.templates:2001
>  #. Type: select
>  #. Description
> +#: ../freevo.templates:2001
>  msgid "Please choose the type of video output to use with Freevo."
>  msgstr "H??y ch???n ki???u k???t xu???t ???nh ?????ng c???n d??ng v???i Freevo."
>  
> -#: ../freevo.templates:3001
>  #. Type: select
>  #. Description
> +#: ../freevo.templates:3001
>  msgid "Output resolution:"
>  msgstr "????? ph??n gi???i k???t xu???t:"
>  
> -#: ../freevo.templates:3001
>  #. Type: select
>  #. Description
> +#: ../freevo.templates:3001
>  msgid ""
>  "Please choose the resolution to use with Freevo. Most CRT television systems "
>  "should be configured as 768x576 (NTSC or PAL). HD television systems use "
>  "1280x720, and FullHD uses 1920x1080."
> -msgstr "H??y ch???n ????? ph??n gi???i c???n d??ng v???i Freevo. "
> -" ??? 768x576	ph???n l???n h??? th???ng TV lo???i CRT (NTSC hay PAL)\n  "
> -" ??? 1280x720	h??? th???ng TV lo???i HD\n"
> -" ??? 1920x1080	FullHD"
> +msgstr ""
> +"H??y ch???n ????? ph??n gi???i c???n d??ng v???i Freevo.  ??? 768x576\tph???n l???n h??? th???ng TV "
> +"lo???i CRT (NTSC hay PAL)\n"
> +"   ??? 1280x720\th??? th???ng TV lo???i HD\n"
> +" ??? 1920x1080\tFullHD"
>  
> -#: ../freevo.templates:4001
>  #. Type: select
>  #. Description
> +#: ../freevo.templates:4001
>  msgid "TV standard:"
>  msgstr "Ti??u chu???n TV:"
>  
> -#: ../freevo.templates:4001
>  #. Type: select
>  #. Description
> +#: ../freevo.templates:4001
>  msgid ""
>  "Please choose the TV standard to use. NTSC is used in North America, much of "
>  "South America, and Japan; SECAM in France, the former USSR, and parts of "
>  "Africa and the Middle East; and PAL elsewhere."
> -msgstr "H??y ch???n ti??u chu???n TV c???n d??ng:\n"
> -" ??? NTSC		M???, ph???n l???n Nam M???, Nh???t b???n\n"
> -" ??? SECAM		Ph??p, Li??n X?? tr?????c, ph???n c???a ch??u Phi v?? Trung ????ng\n"
> -" ??? PAL		c??c n?????c kh??c."
> +msgstr ""
> +"H??y ch???n ti??u chu???n TV c???n d??ng:\n"
> +" ??? NTSC\t\tM???, ph???n l???n Nam M???, Nh???t b???n\n"
> +" ??? SECAM\t\tPh??p, Li??n X?? tr?????c, ph???n c???a ch??u Phi v?? Trung ????ng\n"
> +" ??? PAL\t\tc??c n?????c kh??c."
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "USA broadcast"
>  msgstr "Qu???ng b?? M???"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "USA cable"
>  msgstr "C??p M???"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "USA cable HRC"
>  msgstr "C??p HRC ??? M???"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "Japan broadcast"
>  msgstr "Qu???ng b?? Nh???t b???n"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "Japan cable"
>  msgstr "C??p Nh???t b???n"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "Europe (West)"
>  msgstr "??u (v??ng T??y)"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "Europe (East)"
>  msgstr "??u (v??ng ????ng)"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "Italy"
>  msgstr "??"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "New Zealand"
>  msgstr "Niu Xi-lan"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "Australia"
>  msgstr "??c"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "Ireland"
>  msgstr "Ai-len"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "France"
>  msgstr "Ph??p"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "China broadcast"
>  msgstr "Qu???ng b?? Trung Qu???c"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "South Africa"
>  msgstr "Nam Phi"
>  
> -#: ../freevo.templates:5001
>  #. Type: select
>  #. Choices
> +#: ../freevo.templates:5001
>  msgid "Argentina"
>  msgstr "??c-hen-ti-na"
>  
> -#: ../freevo.templates:5002
>  #. Type: select
>  #. Description
> +#: ../freevo.templates:5002
>  msgid "Channel list:"
>  msgstr "Danh s??ch k??nh:"
>  
> -#: ../freevo.templates:5002
>  #. Type: select
>  #. Description
> +#: ../freevo.templates:5002
>  msgid ""
>  "Please choose the channel list (set of tuning frequencies) that most closely "
>  "matches the one used in your country."
> -msgstr "H??y ch???n danh s??ch c??c k??nh (t???p h???p c??c t???n s??? ??i???u ch???nh l??n s??ng) m?? t????ng ???ng ch??nh x??c nh???t danh s??ch k??nh d??ng ??? ch??? c???a b???n."
> +msgstr ""
> +"H??y ch???n danh s??ch c??c k??nh (t???p h???p c??c t???n s??? ??i???u ch???nh l??n s??ng) m?? "
> +"t????ng ???ng ch??nh x??c nh???t danh s??ch k??nh d??ng ??? ch??? c???a b???n."
>  
> -#: ../freevo.templates:6001
>  #. Type: select
>  #. Default
> +#: ../freevo.templates:6001
>  msgid "Video folder"
>  msgstr "Th?? m???c phim"
>  
> -#: ../freevo.templates:6002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:6002
>  msgid "Title of video folder:"
>  msgstr "T??n c???a th?? m???c phim:"
>  
> -#: ../freevo.templates:6002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:6002
>  msgid "Please choose the title of the video folder."
>  msgstr "H??y ch???n t??n c???a th?? m???c phim."
>  
> -#: ../freevo.templates:6002
> -#: ../freevo.templates:8002
> -#: ../freevo.templates:10002
>  #. Type: string
>  #. Description
>  #. Type: string
>  #. Description
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:6002 ../freevo.templates:8002 ../freevo.templates:10002
>  msgid "This will be displayed by Freevo in overview."
>  msgstr "????y s??? ???????c Freevo hi???n th??? trong to??n c???nh."
>  
> -#: ../freevo.templates:7001
> -#. Type: string
> -#. Default
> -msgid "/home/freevo/video"
> -msgstr "/home/freevo/video"
> -
> -#: ../freevo.templates:7002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:7001
>  msgid "Path to videos:"
>  msgstr "???????ng d???n ?????n phim:"
>  
> -#: ../freevo.templates:7002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:7001
>  msgid "Please choose the directory where video files are stored."
>  msgstr "H??y ch???n th?? m???c n??n ch???a t???p tin phim."
>  
> -#: ../freevo.templates:7002
> -#: ../freevo.templates:9002
> -#: ../freevo.templates:11002
> -#: ../freevo.templates:12002
>  #. Type: string
>  #. Description
>  #. Type: string
> @@ -228,146 +221,146 @@
>  #. Description
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:7001 ../freevo.templates:9001 ../freevo.templates:11001
> +#: ../freevo.templates:12001
>  msgid "You must use an absolute path (with a leading \"/\" character)."
> -msgstr "B???n c???n ph???i ?????t m???t ???????ng d???n tuy???t ?????i (b???t ?????u v???i d????u s??? ch??o ?? / ??)."
> +msgstr ""
> +"B???n c???n ph???i ?????t m???t ???????ng d???n tuy???t ?????i (b???t ?????u v???i d????u s??? ch??o ?? / ??)."
>  
> -#: ../freevo.templates:8001
>  #. Type: string
>  #. Default
> +#: ../freevo.templates:8001
>  msgid "Audio folder"
>  msgstr "Th?? m???c nh???c"
>  
> -#: ../freevo.templates:8002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:8002
>  msgid "Title of audio folder:"
>  msgstr "T??n c???a th?? m???c nh???c:"
>  
> -#: ../freevo.templates:8002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:8002
>  msgid "Please choose the title of the audio folder."
>  msgstr "H??y ch???n t??n c???a th?? m???c ??m nh???c."
>  
> -#: ../freevo.templates:9001
> -#. Type: string
> -#. Default
> -msgid "/home/freevo/audio"
> -msgstr "/home/freevo/audio"
> -
> -#: ../freevo.templates:9002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:9001
>  msgid "Path to audio folder:"
>  msgstr "???????ng d???n ?????n th?? m???c nh???c:"
>  
> -#: ../freevo.templates:9002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:9001
>  msgid "Please choose the directory where audio files are stored."
>  msgstr "H??y ch???n th?? m???c n??n ch???a t???p tin ??m nh???c v?? t???p tin ??m thanh kh??c."
>  
> -#: ../freevo.templates:10001
>  #. Type: string
>  #. Default
> +#: ../freevo.templates:10001
>  msgid "Image folder"
>  msgstr "Th?? m???c ???nh"
>  
> -#: ../freevo.templates:10002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:10002
>  msgid "Title of image folder:"
>  msgstr "T??n c???a th?? m???c ???nh:"
>  
> -#: ../freevo.templates:10002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:10002
>  msgid "Please choose the title of the image folder."
>  msgstr "H??y ch???n t??n c???a th?? m???c h??nh ???nh."
>  
> -#: ../freevo.templates:11001
> -#. Type: string
> -#. Default
> -msgid "/home/freevo/image"
> -msgstr "/home/freevo/image"
> -
> -#: ../freevo.templates:11002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:11001
>  msgid "Path to image folder:"
>  msgstr "???????ng d???n ?????n th?? m???c ???nh:"
>  
> -#: ../freevo.templates:11002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:11001
>  msgid "Please choose the directory where image files are stored."
>  msgstr "H??y ch???n th?? m???c n??n ch???a t???p tin h??nh ???nh."
>  
> -#: ../freevo.templates:12001
> -#. Type: string
> -#. Default
> -msgid "/home/freevo/recordings"
> -msgstr "/home/freevo/recordings"
> -
> -#: ../freevo.templates:12002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:12001
>  msgid "Path to recorded video folder:"
>  msgstr "???????ng d???n ?????n th?? m???c phim ???? thu :"
>  
> -#: ../freevo.templates:12002
>  #. Type: string
>  #. Description
> +#: ../freevo.templates:12001
>  msgid "Please choose the directory where video recording files are stored."
>  msgstr "H??y ch???n th?? m???c n??n ch???a t???p tin thu phim."
>  
> -#: ../freevo.templates:13001
>  #. Type: multiselect
>  #. Choices
> +#: ../freevo.templates:13001
>  msgid "xserver"
>  msgstr "tr??nh ph???c v??? X"
>  
> -#: ../freevo.templates:13001
>  #. Type: multiselect
>  #. Choices
> +#: ../freevo.templates:13001
>  msgid "recordserver"
>  msgstr "tr??nh ph???c v??? Thu"
>  
> -#: ../freevo.templates:13001
>  #. Type: multiselect
>  #. Choices
> +#: ../freevo.templates:13001
>  msgid "encodingserver"
>  msgstr "tr??nh ph???c v??? M?? ho??"
>  
> -#: ../freevo.templates:13001
>  #. Type: multiselect
>  #. Choices
> +#: ../freevo.templates:13001
>  msgid "webserver"
>  msgstr "tr??nh ph???c v??? Web"
>  
> -#: ../freevo.templates:13001
>  #. Type: multiselect
>  #. Choices
> +#: ../freevo.templates:13001
>  msgid "rssserver"
>  msgstr "tr??nh ph???c v??? RSS (ngu???n tin)"
>  
> -#: ../freevo.templates:13002
>  #. Type: multiselect
>  #. Description
> +#: ../freevo.templates:13002
>  msgid "Services to start during boot:"
>  msgstr "D???ch v??? c???n kh???i ch???y khi kh???i ?????ng:"
>  
> -#: ../freevo.templates:13002
>  #. Type: multiselect
>  #. Description
> +#: ../freevo.templates:13002
>  msgid ""
>  "Freevo can be started automatically when the machine boots, using a "
>  "dedicated X server. Web, encoding, RSS, and recording servers can be "
>  "launched at the same time."
> -msgstr "Freevo c?? th??? ???????c t??? ?????ng kh???i ch???y khi m??y t??nh kh???i ?????ng, d??ng m???t tr??nh ph???c v??? X d??nh ri??ng. C?? th??? kh???i ch???y ?????ng th???i c??c tr??nh ph???c v??? ki???u Web, m?? ho??, RSS (ngu???n tin t???c) v?? thu."
> +msgstr ""
> +"Freevo c?? th??? ???????c t??? ?????ng kh???i ch???y khi m??y t??nh kh???i ?????ng, d??ng m???t tr??nh "
> +"ph???c v??? X d??nh ri??ng. C?? th??? kh???i ch???y ?????ng th???i c??c tr??nh ph???c v??? ki???u Web, "
> +"m?? ho??, RSS (ngu???n tin t???c) v?? thu."
>  
> -#: ../freevo.templates:13002
>  #. Type: multiselect
>  #. Description
> +#: ../freevo.templates:13002
>  msgid "Please choose the services you wish to start on boot."
>  msgstr "H??y ch???n nh???ng d???ch v??? b???n mu???n kh???i ch???y khi kh???i ?????ng."
> +
> +#~ msgid "/home/freevo/video"
> +#~ msgstr "/home/freevo/video"
> +
> +#~ msgid "/home/freevo/audio"
> +#~ msgstr "/home/freevo/audio"
> +
> +#~ msgid "/home/freevo/image"
> +#~ msgstr "/home/freevo/image"
> +
> +#~ msgid "/home/freevo/recordings"
> +#~ msgstr "/home/freevo/recordings"
> diff -Nru freevo-1.9.0/debian/pycompat freevo-1.9.0/debian/pycompat
> --- freevo-1.9.0/debian/pycompat	2010-08-11 16:08:44.000000000 +0200
> +++ freevo-1.9.0/debian/pycompat	1970-01-01 01:00:00.000000000 +0100
> @@ -1 +0,0 @@
> -2
> diff -Nru freevo-1.9.0/debian/python-freevo.preinst freevo-1.9.0/debian/python-freevo.preinst
> --- freevo-1.9.0/debian/python-freevo.preinst	2010-02-06 10:22:17.000000000 +0100
> +++ freevo-1.9.0/debian/python-freevo.preinst	2010-12-28 11:17:07.000000000 +0100
> @@ -3,7 +3,8 @@
>  
>  if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 1.9.0-4
>  then
> -       pycentral pkgremove freevo
> +       pycentral pkgremove freevo || true #fix bug #606782
> +       pycentral pkgremove python-freevo || true #fix bug #606782
>         for i in 2.4 2.5 2.6 ; do
>           if test -r /usr/lib/python$i/site-packages/freevo ; then
>             find /usr/lib/python$i/site-packages/freevo \
> diff -Nru freevo-1.9.0/debian/pyversions freevo-1.9.0/debian/pyversions
> --- freevo-1.9.0/debian/pyversions	1970-01-01 01:00:00.000000000 +0100
> +++ freevo-1.9.0/debian/pyversions	2010-12-24 23:03:23.000000000 +0100
> @@ -0,0 +1 @@
> +2.5,2.6
> diff -Nru freevo-1.9.0/debian/README.Debian freevo-1.9.0/debian/README.Debian
> --- freevo-1.9.0/debian/README.Debian	2009-09-04 17:59:51.000000000 +0200
> +++ freevo-1.9.0/debian/README.Debian	2010-12-27 23:40:50.000000000 +0100
> @@ -24,8 +24,8 @@
>  - all freevo-related process will not be run as root, but as the
>    'freevo' user;
>  
> -- the data is stored in  /home/freevo , and not in
> -   /var/lib/freevo , /var/cache/freevo ....;
> +- the data is stored in subdirectories of /var/lib/freevo , and not in
> +   /var/cache/freevo ....;
>  
>  - the freevo data has permission -rw-rw-r--  so that all users
>    in the 'freevo' group can share it (for this reason, we will 
> @@ -81,7 +81,9 @@
>  
>  When you install the freevo Debian package (hereafter referred to as
>  "freevo .deb"), an user 'freevo' is created, and a group 'freevo' as
> -well.  The user 'freevo' has home directory /home/freevo .
> +well.  The user 'freevo' has home directory /var/lib/freevo 
> +(unless an older version was installed before, in that case it is 
> +/home/freevo ) .
>  
>  You should add normal users to the 'freevo' group:
>  in this way, they will share all the data, that is,
> @@ -92,8 +94,8 @@
>  When you have installed freevo, there were many debconf
>  questions (the number is depending on your debconf setting).
>  If you did not change the default directories, then all data related
> -to freevo will be stored inside /home/freevo .  For example, the
> -default video directory is /home/freevo/video/ .
> +to freevo will be stored inside /var/lib/freevo .  For example, the
> +default video directory is /var/lib/freevo/video/ .
>  
>  To find out the chosen directories , read the config files 
>   /etc/default/freevo
> @@ -252,4 +254,4 @@
>  BTW, to use 'nvram-wakeup', you should add 'nvram' to the list of
>  modules in /etc/modules so that it is loaded at boot.
>  
> - -- A Mennucc <mennucc1@debian.org>, Fri,  4 Sep 2009 17:59:34 +0200
> + -- A Mennucc <mennucc1@debian.org>, Mon, 27 Dec 2010 23:40:50 +0100
> diff -Nru freevo-1.9.0/debian/rules freevo-1.9.0/debian/rules
> --- freevo-1.9.0/debian/rules	2010-02-05 23:34:29.000000000 +0100
> +++ freevo-1.9.0/debian/rules	2010-12-24 23:02:38.000000000 +0100
> @@ -24,8 +24,8 @@
>  
>  	: # Replace all '#!' calls to python with /usr/bin/python
>  	: # and make them executable
> -	for i in debian/tmp/usr/bin/freevo `find debian/tmp -type f -name "*py" `; do \
> -	  sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
> +	for i in debian/tmp/usr/bin/freevo debian/tmp/usr/share/freevo/htdocs/downloadurl `find debian/tmp -type f -name "*py" ` ; do \
> +	  sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python \1,' \
>  		"$$i" > "$$i.temp"; \
>  	  if cmp --quiet "$$i" "$$i.temp"; then \
>  	    rm -f "$$i.temp"; \
> diff -Nru freevo-1.9.0/debian/scripts/freevo freevo-1.9.0/debian/scripts/freevo
> --- freevo-1.9.0/debian/scripts/freevo	2008-02-17 19:25:35.000000000 +0100
> +++ freevo-1.9.0/debian/scripts/freevo	2010-08-30 23:46:43.000000000 +0200
> @@ -2,6 +2,7 @@
>  
>  
>  DAEMON=/usr/bin/freevo
> +X="$DAEMON.real $@"
>  
>  U=`id -u`
>  G=`id -g`
> @@ -35,7 +36,7 @@
>  for i in `id -G` ; do
>    if test "$i" = "$FREEVO_GID"   ; then
>     echo "Switching process to principal group 'freevo'."
> -   exec sg freevo -c "$DAEMON.real $@"
> +   exec sg freevo -c "$X"
>   fi
>  done
>
Attachment: signature.asc
Description: Digital signature
Reply to:
References:
- Re: [Pkg-freevo-maint] Bug#607921: freevo: (unowned) files in /home (after purge (policy 6.8))
  - From: Julien Cristau <jcristau@debian.org>
Prev by Date: Bug#608182: marked as done (unblock: openoffice.org/1:3.2.1-11)
Next by Date: Re: [RFC] subversion upload for squeeze - what to include
Previous by thread: Re: [Pkg-freevo-maint] Bug#607921: freevo: (unowned) files in /home (after purge (policy 6.8))
Next by thread: Bug#608221: RM: youtube-dl/2010.12.09-1
Index(es):
- Date
- Thread