r7877 - in /vdr/vdr/trunk/debian: TODO.Debian changelog po/ru.po runvdr

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Tue Jul 14 18:58:45 2009
New Revision: 7877

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7877
Log:
* Fixed syntax error in runvdr and don't set "-p" anymore, which is only
  supported by Bash (Closes: #536894)
* Added Russian debconf template provided by Yuri Kozlov (Closes: #536561)

Added:
    vdr/vdr/trunk/debian/po/ru.po
Modified:
    vdr/vdr/trunk/debian/TODO.Debian
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/runvdr

Modified: vdr/vdr/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/TODO.Debian?rev=7877&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/TODO.Debian (original)
+++ vdr/vdr/trunk/debian/TODO.Debian Tue Jul 14 18:58:45 2009
@@ -3,3 +3,4 @@
 TODO: Remove all vdr 1.2.6 upgrade code and conflict with 1.2.6
 TODO: Manpage for pic2mpg
 TODO: Remove | libcap-dev build dep, if Etch gets uninteresting
+TODO: Add option USE_LIRC=yes|no (see http://www.vdr-portal.de/board/thread.php?postid=829057#post829057)

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=7877&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Tue Jul 14 18:58:45 2009
@@ -1,3 +1,11 @@
+vdr (1.6.0-11) unstable; urgency=low
+
+  * Fixed syntax error in runvdr and don't set "-p" anymore, which is only
+    supported by Bash (Closes: #536894)
+  * Added Russian debconf template provided by Yuri Kozlov (Closes: #536561)
+
+ -- Tobias Grimm <etobi at debian.org>  Tue, 14 Jul 2009 20:55:37 +0200
+
 vdr (1.6.0-10) unstable; urgency=low
 
   * Upgraded opt-20_liemikuutio.dpatch to version 1.27

Added: vdr/vdr/trunk/debian/po/ru.po
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/po/ru.po?rev=7877&op=file
==============================================================================
--- vdr/vdr/trunk/debian/po/ru.po (added)
+++ vdr/vdr/trunk/debian/po/ru.po Tue Jul 14 18:58:45 2009
@@ -1,0 +1,82 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <yuray at komyakino.ru>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr 1.6.0-8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-11-30 10:28+0100\n"
+"PO-Revision-Date: 2009-07-02 21:17+0400\n"
+"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\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"
+
+#. Type: note
+#. Description
+#: ../vdr.templates:1001
+msgid "VDR needs DVB kernel modules"
+msgstr "Для VDR требуются ядерные модули DVB"
+
+#. Type: note
+#. Description
+#: ../vdr.templates:1001
+msgid ""
+"VDR needs DVB (Digital Video Broadcasting) kernel modules. You may have to "
+"separately install these modules. Ensure that the correct modules for your "
+"DVB hardware get loaded automatically e.g. by adding them to /etc/modules "
+"otherwise VDR won't work!"
+msgstr ""
+"VDR нужны ядерные модули DVB (цифровое телевидение). Вам может "
+"потребоваться самостоятельно установить эти модули. Убедитесь, что "
+"для оборудования DVB автоматически загружаются подÑ
одящие модули, "
+"например, добавьте иÑ
 в /etc/modules, иначе VDR не заработает!"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:2001
+msgid "Satellite, Terrestrial, Cable"
+msgstr "Спутниковая, Эфирная, Кабельная"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:2002
+msgid "DVB card type:"
+msgstr "Тип карты DVB:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:2002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr.  You may "
+"have to change this file depending on your setup."
+msgstr ""
+"Для корректной работы VDR требуется указать тип карты DVB. "
+"На основе вашего выбора в каталог /var/lib/vdr будет помещён "
+"подÑ
одящий файл channels.conf. В зависимости от установки вам "
+"может потребоваться изменить этот файл."
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:3001
+msgid "Create /var/lib/video.00?"
+msgstr "Создать /var/lib/video.00?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:3001
+msgid ""
+"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"You can either create this directory now, or change this behavior later  by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"По умолчанию для Ñ
ранения записей VDR использует /var/lib/video.00. "
+"Вы можете создать этот каталог сейчас, или изменить эту настройку "
+"позже, отредактировав значение переменной VIDEO_DIR в /etc/default/vdr."
+

Modified: vdr/vdr/trunk/debian/runvdr
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/runvdr?rev=7877&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/runvdr (original)
+++ vdr/vdr/trunk/debian/runvdr Tue Jul 14 18:58:45 2009
@@ -1,4 +1,4 @@
-#!/bin/sh -p
+#!/bin/sh
 
 . /usr/lib/vdr/config-loader.sh
 
@@ -9,14 +9,14 @@
 
 VDRCMD="$VDR_ENV /usr/bin/vdr $*"
 
-get_modulenames
+get_modulenames()
 {
     MODULES=`lsmod | awk '/^dvb_core/ {gsub(/,/,"\n", $4); print $4}' | tac`
     [ "$MODULES" ] && MODULES="$MODULES dvb_core"
 }
 
 # TODO: check if udev handles this on newer systems!?
-set_permissions
+set_permissions()
 {
     if [ "$USER" -o "$GROUP" ]; then
         for FILE in av7110_ir budget_ci_ir; do
@@ -28,7 +28,7 @@
     chmod o+r /dev/input/event*
 }
 
-load_dvb_modules
+load_dvb_modules()
 {
     if modprobe dvb >/dev/null 2>&1 ; then
         get_modulenames
@@ -46,7 +46,7 @@
     sleep 15
 }
 
-unload_dvb_modules
+unload_dvb_modules()
 {
     for MODULE in $MODULES; do
         rmmod $MODULE >/dev/null 2>&1