aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:41 (GMT)
committerGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:41 (GMT)
commit1ddc68f41b45a67503550821e4492c6a08970c88 (patch)
tree6bcbc690aa3a884a38e7d7a56a5ca566c9264a4a
parentac831d7dd6f53438c58f76d61e4a1bebd27008a9 (diff)
v3.90
-rw-r--r--Changes7
-rw-r--r--debian/changelog17
-rw-r--r--debian/control8
-rw-r--r--debian/po/POTFILES.in1
-rw-r--r--debian/po/da.po123
-rw-r--r--debian/po/de.po121
-rw-r--r--debian/po/es.po125
-rw-r--r--debian/po/fr.po121
-rw-r--r--debian/po/templates.pot106
-rw-r--r--debian/xawtv.template.Master44
-rw-r--r--debian/xawtv.template.da67
-rw-r--r--debian/xawtv.template.de71
-rw-r--r--debian/xawtv.template.es68
-rw-r--r--debian/xawtv.templates86
-rw-r--r--vbistuff/alevtd.c10
-rw-r--r--x11/MoTV-fr520
-rw-r--r--x11/blit.c1
-rw-r--r--x11/xt.c2
-rw-r--r--x11/xv.c10
-rw-r--r--xawtv.spec2
20 files changed, 910 insertions, 600 deletions
diff --git a/Changes b/Changes
index dc79c91..92038f1 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,11 @@
+3.90
+====
+
+ * bugfix release (was intented to be 3.88.2, but a debian NMU f*cked
+ up my version numbering ...).
+
+
3.87 => 3.88
============
diff --git a/debian/changelog b/debian/changelog
index 2288d11..a4f6327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+xawtv (3.90) unstable; urgency=low
+
+ * bugfix release (closes: #204990).
+ * added spanish template file (closes: #215652).
+ * fix webcam description (closes: #216061).
+ * fix build dependencies (closes: #216164).
+ * rebuild with new libquicktime likely closes: #193712.
+
+ -- Gerd Knorr <kraxel@debian.org> Fri, 17 Oct 2003 12:55:22 +0200
+
+xawtv (3.88.1) unstable; urgency=low
+
+ * bugfix release (closes: #214120).
+ * updated debconf (closes: #198780, #199982).
+
+ -- Gerd Knorr <kraxel@debian.org> Tue, 7 Oct 2003 17:26:57 +0200
+
xawtv (3.88) unstable; urgency=low
* new release.
diff --git a/debian/control b/debian/control
index 8a81e12..9ee4c70 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
Source: xawtv
Section: graphics
Priority: extra
-Build-Depends: libjpeg-dev, libncurses5-dev, xlibs-dev (>= 4.0.1), liblircclient-dev, debhelper (>= 4.0), xutils, xbase-clients, aalib1-dev, libasound2-dev, libzvbi-dev (>= 0.2.1), libquicktime-dev, libxaw7-dev, xlibmesa-gl-dev, libxft2-dev
+Build-Depends: libjpeg-dev, libncurses5-dev, xlibs-dev (>= 4.0.1), liblircclient-dev, debhelper (>= 4.1.16), xutils, xbase-clients, aalib1-dev, libasound2-dev, libzvbi-dev (>= 0.2.1), libquicktime-dev, libxaw7-dev, xlibmesa-gl-dev, libxft2-dev, po-debconf, libpng-dev
Maintainer: Gerd Knorr <kraxel@debian.org>
-Standards-Version: 3.5.9
+Standards-Version: 3.6.1
Package: xawtv
Section: x11
@@ -112,8 +112,8 @@ Depends: ${shlibs:Depends}, xawtv-plugins (=${Source-Version})
Recommends: ftp, ssh
Description: capture and upload images
webcam captures images from a video4linux device like
- bttv, annotates them and and uploads them to a webserver
- using ftp or ssh in a endless loop.
+ bttv, annotates them and uploads them to a webserver
+ using ftp or ssh in an endless loop.
Package: alevtd
Section: net
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 0000000..56dbae9
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] xawtv.templates
diff --git a/debian/po/da.po b/debian/po/da.po
new file mode 100644
index 0000000..151370f
--- /dev/null
+++ b/debian/po/da.po
@@ -0,0 +1,123 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-10-07 13:31+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../xawtv.templates:4
+msgid "Create video4linux (/dev/video*) special files?"
+msgstr "Opret video4linux (/dev/video*) specielle filer?"
+
+#. Description
+#: ../xawtv.templates:9
+msgid "scan for TV stations?"
+msgstr "Skan efter TV stationer?"
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I can do a scan of all channels and put a list of the TV stations I've found "
+"into the config file."
+msgstr ""
+"Jeg kan lave en skanning efter alle kanaler og putte dem i en liste af de TV "
+"stationer jeg har fundet, ind i en konfigurations fil."
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"This requires a working bttv driver. If bttv isn't configured correctly I "
+"might not find the TV stations."
+msgstr ""
+"Dette kræver en virkende bttv driver. Hvis bttv ikke er korrekt "
+"konfigureret, vil du måske ikke finde TV stationerne."
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I'll try to pick up the channel names from videotext. This will work with "
+"PAL only."
+msgstr ""
+"Jeg vil prøve at finde kanal navne fra videotext. Dette vil kun virke med "
+"PAL."
+
+#. Choices
+#: ../xawtv.templates:21
+msgid "PAL, SECAM, NTSC"
+msgstr "PAL, SECAM, NTSC"
+
+#. Description
+#: ../xawtv.templates:22
+msgid "Which TV norm is used in your country?"
+msgstr "Hvilken TV norm er brugt i dit land?"
+
+#. Description
+#: ../xawtv.templates:27
+msgid "Create a default configuration for xawtv?"
+msgstr "Opret en standard konfigurations fil til xawtv?"
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"You can create a system-wide configuration file for xawtv with reasonable "
+"default values for the country you live in (which TV norm is used for "
+"example)."
+msgstr ""
+"Du kan oprette en system-bred konfigurations fil til xawtv med fornuftige "
+"standard værdier for landet du lever i (f.eks. hvilken TV norm der bliver "
+"brugt i dit land)."
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"It is not required to have a global configuration file, but it will be more "
+"comfortable for your users if they find a working default configuration."
+msgstr ""
+"Det er ikke krævet at have en global konfigurations fil, men det vil gøre "
+"det mere behageligt for dine brugere, hvis de finder en standard virkende "
+"konfiguration."
+
+#. Choices
+#: ../xawtv.templates:38
+msgid ""
+"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
+"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
+msgstr ""
+"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
+"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
+
+#. Description
+#: ../xawtv.templates:39
+msgid "Which frequency table should be used?"
+msgstr "Hvilken frekvens tabel skal bruges?"
+
+#. Description
+#: ../xawtv.templates:39
+msgid ""
+"A frequency table is just a list of TV channel names/numbers and the "
+"corresponding broadcast frequencies for these channels. Different regions "
+"use different standards here..."
+msgstr ""
+"En frekvens tabel er bare en liste af kanal navne/tal og de tilsvarende "
+"frekvenser for disse kanaler. Forskellige regioner bruger forskellige "
+"standarder her..."
diff --git a/debian/po/de.po b/debian/po/de.po
new file mode 100644
index 0000000..d94ff4c
--- /dev/null
+++ b/debian/po/de.po
@@ -0,0 +1,121 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-10-07 13:31+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../xawtv.templates:4
+msgid "Create video4linux (/dev/video*) special files?"
+msgstr "Sollen Geräte-Dateien (/dev/video*) für video4linux erstellt werden?"
+
+#. Description
+#: ../xawtv.templates:9
+msgid "scan for TV stations?"
+msgstr "Soll nach TV-Stationen gesucht werden?"
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I can do a scan of all channels and put a list of the TV stations I've found "
+"into the config file."
+msgstr ""
+"Ich kann einen Suche nach Kanälen durchführen und eine Liste der gefundenen "
+"TV-Stationen in die Konfigurationsdatei schreiben."
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"This requires a working bttv driver. If bttv isn't configured correctly I "
+"might not find the TV stations."
+msgstr ""
+"Dafür ist ein funktionierender BTTV-Treiber erforderlich. Wenn BTTV nicht "
+"richtig eingerichtet ist, werde ich keine Stationen finden können."
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I'll try to pick up the channel names from videotext. This will work with "
+"PAL only."
+msgstr ""
+"Ich werde versuchen, die Namen der Kanäle aus dem Videotext herauszulesen. "
+"Dies funktioniert nur mit PAL."
+
+#. Choices
+#: ../xawtv.templates:21
+msgid "PAL, SECAM, NTSC"
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:22
+msgid "Which TV norm is used in your country?"
+msgstr "Welche TV-Norm benutzt man in ihrem Land?"
+
+#. Description
+#: ../xawtv.templates:27
+msgid "Create a default configuration for xawtv?"
+msgstr "Soll eine Standard-Konfiguration für xawtv erstellt werden?"
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"You can create a system-wide configuration file for xawtv with reasonable "
+"default values for the country you live in (which TV norm is used for "
+"example)."
+msgstr ""
+"Sie können für xawtv eine systemweite Konfigurationsdatei erstellen, die "
+"vernünftige Voreinstellungen für ihr Land enthält (z.B. welche TV-Norm "
+"benutzt wird)."
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"It is not required to have a global configuration file, but it will be more "
+"comfortable for your users if they find a working default configuration."
+msgstr ""
+"Eine globale Konfigurationsdatei ist nicht unbedingt erforderlich, aber es "
+"ist für die Benutzer sicherlich angenehm, gleich eine funktionierende "
+"Konfiguration vorzufinden."
+
+#. Choices
+#: ../xawtv.templates:38
+msgid ""
+"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
+"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:39
+msgid "Which frequency table should be used?"
+msgstr "Welche Frequenzen-Tabelle soll benutzt werden?"
+
+#. Description
+#: ../xawtv.templates:39
+msgid ""
+"A frequency table is just a list of TV channel names/numbers and the "
+"corresponding broadcast frequencies for these channels. Different regions "
+"use different standards here..."
+msgstr ""
+"Eine Frequenzen-Tabelle ist einfach nur eine Liste der TV-Kanäle (Namen oder "
+"Nummern) mit dazugehörigen Frequenzen. Verschiedene Regionen verwenden "
+"unterschiedliche Standards."
diff --git a/debian/po/es.po b/debian/po/es.po
new file mode 100644
index 0000000..6e17a29
--- /dev/null
+++ b/debian/po/es.po
@@ -0,0 +1,125 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+# Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>, 2003
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xawtv 3.88.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-10-07 13:31+0200\n"
+"PO-Revision-Date: 2003-10-12 13:50+0200\n"
+"Last-Translator: Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>\n"
+"Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../xawtv.templates:4
+msgid "Create video4linux (/dev/video*) special files?"
+msgstr "¿Crear los ficheros especiales video4linux (/dev/video*)?"
+
+#. Description
+#: ../xawtv.templates:9
+msgid "scan for TV stations?"
+msgstr "¿Buscar cadenas de televisión?"
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I can do a scan of all channels and put a list of the TV stations I've found "
+"into the config file."
+msgstr ""
+"Puedo realizar una búsqueda de todos los canales y poner una lista de las "
+"cadenas de televisión encontradas en el fichero de configuración."
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"This requires a working bttv driver. If bttv isn't configured correctly I "
+"might not find the TV stations."
+msgstr ""
+"Esto requiere un controlador bttv que funcione. Si bttv no se encuentra "
+"configurado correctamente puede que no encuentre las cadenas de televisión."
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I'll try to pick up the channel names from videotext. This will work with "
+"PAL only."
+msgstr ""
+"Trataré de obtener los nombres de los canales del teletexto. Esto sólo "
+"funcionará con PAL."
+
+#. Choices
+#: ../xawtv.templates:21
+msgid "PAL, SECAM, NTSC"
+msgstr "PAL, SECAM, NTSC"
+
+#. Description
+#: ../xawtv.templates:22
+msgid "Which TV norm is used in your country?"
+msgstr "¿Qué sistema de televisión se usa en su país?"
+
+#. Description
+#: ../xawtv.templates:27
+msgid "Create a default configuration for xawtv?"
+msgstr "¿Crear una configuración predeterminada para xawtv?"
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"You can create a system-wide configuration file for xawtv with reasonable "
+"default values for the country you live in (which TV norm is used for "
+"example)."
+msgstr ""
+"Puede crear un fichero de configuración global de xawtv con valores "
+"razonables para el país en el que vive (como, por ejemplo, el sistema de "
+"televisión que se emplea)."
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"It is not required to have a global configuration file, but it will be more "
+"comfortable for your users if they find a working default configuration."
+msgstr ""
+"No es obligatorio tener un fichero de configuración global, pero será más "
+"cómodo para sus usuarios encontrarse una configuración por defecto que "
+"funciona."
+
+#. Choices
+#: ../xawtv.templates:38
+msgid ""
+"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
+"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
+msgstr ""
+"EEUU-bcast, EEUU-cable, EEUU-cable-hrc, Japón-bcast, Japón-cable, Europa "
+"Occidental, Europa Oriental, Italia, Nueva Zelanda, Australia, Irlanda, "
+"Francia, China-bcast"
+
+#. Description
+#: ../xawtv.templates:39
+msgid "Which frequency table should be used?"
+msgstr "¿Qué tabla de frecuencias se debería usar?"
+
+#. Description
+#: ../xawtv.templates:39
+msgid ""
+"A frequency table is just a list of TV channel names/numbers and the "
+"corresponding broadcast frequencies for these channels. Different regions "
+"use different standards here..."
+msgstr ""
+"Una tabla de frecuencias es sólo una lista de nombres/números de canales de "
+"televisión y sus correspondientes frecuencias de emisión. En diferentes "
+"regiones se utilizan diferentes estándares..."
diff --git a/debian/po/fr.po b/debian/po/fr.po
new file mode 100644
index 0000000..d6333ea
--- /dev/null
+++ b/debian/po/fr.po
@@ -0,0 +1,121 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xawtv_3.88\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-06-25 18:42+0200\n"
+"PO-Revision-Date: 2003-07-03 08:37+0200\n"
+"Last-Translator: Michel Grentzinger <mic.grentz@online.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../xawtv.templates:4
+msgid "Create video4linux (/dev/video*) special files?"
+msgstr "Créer les fichiers spéciaux video4linux (/dev/video*) ?"
+
+#. Description
+#: ../xawtv.templates:9
+msgid "scan for TV stations?"
+msgstr "Rechercher des chaînes de télévision ?"
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I can do a scan of all channels and put a list of the TV stations I've found "
+"into the config file."
+msgstr ""
+"Je peux parcourir l'ensemble des canaux et placer la liste de toutes les "
+"chaînes de télévision que j'ai trouvées dans le fichier de configuration."
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"This requires a working bttv driver. If bttv isn't configured correctly I "
+"might not find the TV stations."
+msgstr ""
+"Cela nécessite un pilote fonctionnel pour bttv. Si bttv n'est pas encore "
+"configuré correctement, je ne pourrai sans doute pas trouver les chaînes de "
+"télévision."
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I'll try to pick up the channel names from videotext. This will work with "
+"PAL only."
+msgstr ""
+"Je vais essayer de déterminer le nom des chaînes à partir du télétexte. Cela "
+"fonctionne uniquement avec la norme PAL."
+
+#. Choices
+#: ../xawtv.templates:21
+msgid "PAL, SECAM, NTSC"
+msgstr "PAL, SECAM, NTSC"
+
+#. Description
+#: ../xawtv.templates:22
+msgid "Which TV norm is used in your country?"
+msgstr "Quelle norme de diffusion télévisuelle est employée dans votre pays ?"
+
+#. Description
+#: ../xawtv.templates:27
+msgid "Create a default configuration for xawtv?"
+msgstr "Créer une configuration par défaut pour xawtv ?"
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"You can create a system-wide configuration file for xawtv with reasonable "
+"default values for the country you live in (which TV norm is used for "
+"example)."
+msgstr ""
+"Vous pouvez créer un fichier de configuration générique pour xawtv avec des "
+"valeurs par défaut adaptées au pays dans lequel vous résidez (par exemple la "
+"norme télévisuelle employée)."
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"It is not required to have a global configuration file, but it will be more "
+"comfortable for your users if they find a working default configuration."
+msgstr ""
+"Il n'est pas nécessaire de disposer d'un fichier de configuration générique, "
+"mais vos utilisateurs se sentiront plus à l'aise s'ils trouvent une "
+"configuration par défaut qui fonctionne."
+
+#. Choices
+#: ../xawtv.templates:38
+msgid ""
+"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
+"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
+msgstr ""
+"us-bcast, us-cable, us-cable-hrc, japon-bcast, japon-cable, europe-ouest, "
+"europe-est, italie, nouvelle-zélande, australie, irlande, france, chine-bcast"
+
+#. Description
+#: ../xawtv.templates:39
+msgid "Which frequency table should be used?"
+msgstr "Quelle table de fréquence doit être utilisée ?"
+
+#. Description
+#: ../xawtv.templates:39
+msgid ""
+"A frequency table is just a list of TV channel names/numbers and the "
+"corresponding broadcast frequencies for these channels. Different regions "
+"use different standards here..."
+msgstr ""
+"Un tableau de fréquences conciste simplement en une liste de numéros ou de "
+"noms de chaînes, associés aux fréquences de diffusion correspondantes. Ici, "
+"différentes zones utilisent différents standards...."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 0000000..7476728
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,106 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-10-07 13:31+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../xawtv.templates:4
+msgid "Create video4linux (/dev/video*) special files?"
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:9
+msgid "scan for TV stations?"
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I can do a scan of all channels and put a list of the TV stations I've found "
+"into the config file."
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"This requires a working bttv driver. If bttv isn't configured correctly I "
+"might not find the TV stations."
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:9
+msgid ""
+"I'll try to pick up the channel names from videotext. This will work with "
+"PAL only."
+msgstr ""
+
+#. Choices
+#: ../xawtv.templates:21
+msgid "PAL, SECAM, NTSC"
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:22
+msgid "Which TV norm is used in your country?"
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:27
+msgid "Create a default configuration for xawtv?"
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"You can create a system-wide configuration file for xawtv with reasonable "
+"default values for the country you live in (which TV norm is used for "
+"example)."
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:27
+msgid ""
+"It is not required to have a global configuration file, but it will be more "
+"comfortable for your users if they find a working default configuration."
+msgstr ""
+
+#. Choices
+#: ../xawtv.templates:38
+msgid ""
+"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, "
+"europe-east, italy, newzealand, australia, ireland, france, china-bcast"
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:39
+msgid "Which frequency table should be used?"
+msgstr ""
+
+#. Description
+#: ../xawtv.templates:39
+msgid ""
+"A frequency table is just a list of TV channel names/numbers and the "
+"corresponding broadcast frequencies for these channels. Different regions "
+"use different standards here..."
+msgstr ""
diff --git a/debian/xawtv.template.Master b/debian/xawtv.template.Master
deleted file mode 100644
index 914df4c..0000000
--- a/debian/xawtv.template.Master
+++ /dev/null
@@ -1,44 +0,0 @@
-Template: xawtv/makedev
-Type: boolean
-Default: true
-Description: Create video4linux (/dev/video*) special files?
-
-Template: xawtv/build-config
-Type: boolean
-Default: false
-Description: Create a default configuration for xawtv?
- You can create a system-wide configuration file
- for xawtv with reasonable default values for the
- country you live in (which TV norm is used for
- example).
- .
- It is not required to have a global configuration
- file, but it will be more comfortable for your
- users if they find a working default configuration.
-
-Template: xawtv/tvnorm
-Type: select
-Choices: PAL, SECAM, NTSC
-Description: Which TV norm is used in your country?
-
-Template: xawtv/freqtab
-Type: select
-Choices: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast
-Description: Which frequency table should be used?
- A frequency table is just a list of TV channel
- names/numbers and the corresponding broadcast
- frequencies for these channels. Different regions
- use different standards here...
-
-Template: xawtv/channel-scan
-Type: boolean
-Default: yes
-Description: scan for TV stations?
- I can do a scan of all channels and put a list of
- the TV stations I've found into the config file.
- .
- This requires a working bttv driver. If bttv isn't
- configured correctly I might not find the TV stations.
- .
- I'll try to pick up the channel names from videotext.
- This will work with PAL only.
diff --git a/debian/xawtv.template.da b/debian/xawtv.template.da
deleted file mode 100644
index 577ad2c..0000000
--- a/debian/xawtv.template.da
+++ /dev/null
@@ -1,67 +0,0 @@
-Template: xawtv/channel-scan
-Type: boolean
-Default: yes
-Description: scan for TV stations?
- I can do a scan of all channels and put a list of the TV stations I've
- found into the config file.
- .
- This requires a working bttv driver. If bttv isn't configured correctly I
- might not find the TV stations.
- .
- I'll try to pick up the channel names from videotext. This will work with
- PAL only.
-Description-da: Skan efter TV stationer?
- Jeg kan lave en skanning efter alle kanaler og putte dem i en liste af de
- TV stationer jeg har fundet, ind i en konfigurations fil.
- .
- Dette kræver en virkende bttv driver. Hvis bttv ikke er korrekt
- konfigureret, vil du måske ikke finde TV stationerne.
- .
- Jeg vil prøve at finde kanal navne fra videotext. Dette vil kun virke med
- PAL.
-
-Template: xawtv/makedev
-Type: boolean
-Default: true
-Description: Create video4linux (/dev/video*) special files?
-Description-da: Opret video4linux (/dev/video*) specielle filer?
-
-Template: xawtv/tvnorm
-Type: select
-Choices: PAL, SECAM, NTSC
-Choices-da: PAL, SECAM, NTSC
-Description: Which TV norm is used in your country?
-Description-da: Hvilken TV norm er brugt i dit land?
-
-Template: xawtv/freqtab
-Type: select
-Choices: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast
-Choices-da: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast
-Description: Which frequency table should be used?
- A frequency table is just a list of TV channel names/numbers and the
- corresponding broadcast frequencies for these channels. Different regions
- use different standards here...
-Description-da: Hvilken frekvens tabel skal bruges?
- En frekvens tabel er bare en liste af kanal navne/tal og de tilsvarende
- frekvenser for disse kanaler. Forskellige regioner bruger forskellige
- standarder her...
-
-Template: xawtv/build-config
-Type: boolean
-Default: false
-Description: Create a default configuration for xawtv?
- You can create a system-wide configuration file for xawtv with reasonable
- default values for the country you live in (which TV norm is used for
- example).
- .
- It is not required to have a global configuration file, but it will be
- more comfortable for your users if they find a working default
- configuration.
-Description-da: Opret en standard konfigurations fil til xawtv?
- Du kan oprette en system-bred konfigurations fil til xawtv med fornuftige
- standard værdier for landet du lever i (f.eks. hvilken TV norm der bliver
- brugt i dit land).
- .
- Det er ikke krævet at have en global konfigurations fil, men det vil gøre
- det mere behageligt for dine brugere, hvis de finder en standard virkende
- konfiguration.
diff --git a/debian/xawtv.template.de b/debian/xawtv.template.de
deleted file mode 100644
index dbfc75b..0000000
--- a/debian/xawtv.template.de
+++ /dev/null
@@ -1,71 +0,0 @@
-Template: xawtv/makedev
-Type: boolean
-Default: true
-Description: Create video4linux (/dev/video*) special files?
-Description-de: Sollen Geräte-Dateien (/dev/video*) für video4linux erstellt werden?
-
-Template: xawtv/build-config
-Type: boolean
-Default: false
-Description: Create a default configuration for xawtv?
- You can create a system-wide configuration file
- for xawtv with reasonable default values for the
- country you live in (which TV norm is used for
- example).
- .
- It is not required to have a global configuration
- file, but it will be more comfortable for your
- users if they find a working default configuration.
-Description-de: Soll eine Standard-Konfiguration für xawtv erstellt werden?
- Sie können für xawtv eine systemweite Konfigurationsdatei
- erstellen, die vernünftige Voreinstellungen für ihr Land
- enthält (z.B. welche TV-Norm benutzt wird).
- .
- Eine globale Konfigurationsdatei ist nicht unbedingt
- erforderlich, aber es ist für die Benutzer sicherlich
- angenehm, gleich eine funktionierende Konfiguration
- vorzufinden.
-
-Template: xawtv/tvnorm
-Type: select
-Choices: PAL, SECAM, NTSC
-Description: Which TV norm is used in your country?
-Description-de: Welche TV-Norm benutzt man in ihrem Land?
-
-Template: xawtv/freqtab
-Type: select
-Choices: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast
-Description: Which frequency table should be used?
- A frequency table is just a list of TV channel
- names/numbers and the corresponding broadcast
- frequencies for these channels. Different regions
- use different standards here...
-Description-de: Welche Frequenzen-Tabelle soll benutzt werden?
- Eine Frequenzen-Tabelle ist einfach nur eine Liste der
- TV-Kanäle (Namen oder Nummern) mit dazugehörigen
- Frequenzen. Verschiedene Regionen verwenden unterschiedliche
- Standards.
-
-Template: xawtv/channel-scan
-Type: boolean
-Default: yes
-Description: scan for TV stations?
- I can do a scan of all channels and put a list of
- the TV stations I've found into the config file.
- .
- This requires a working bttv driver. If bttv isn't
- configured correctly I might not find the TV stations.
- .
- I'll try to pick up the channel names from videotext.
- This will work with PAL only.
-Description-de: Soll nach TV-Stationen gesucht werden?
- Ich kann einen Suche nach Kanälen durchführen und
- eine Liste der gefundenen TV-Stationen in die
- Konfigurationsdatei schreiben.
- .
- Dafür ist ein funktionierender BTTV-Treiber erforderlich.
- Wenn BTTV nicht richtig eingerichtet ist, werde ich keine
- Stationen finden können.
- .
- Ich werde versuchen, die Namen der Kanäle aus dem
- Videotext herauszulesen. Dies funktioniert nur mit PAL.
diff --git a/debian/xawtv.template.es b/debian/xawtv.template.es
deleted file mode 100644
index 4f16c87..0000000
--- a/debian/xawtv.template.es
+++ /dev/null
@@ -1,68 +0,0 @@
-Template: xawtv/makedev
-Type: boolean
-Default: true
-Description: Create video4linux (/dev/video*) special files?
-Description-es: ¿Crear los ficheros especiales video4linux (/dev/video*)?
-
-Template: xawtv/build-config
-Type: boolean
-Default: false
-Description: Create a default configuration for xawtv?
- You can create a system-wide configuration file
- for xawtv with reasonable default values for the
- country you live in (which TV norm is used for
- example).
- .
- It is not required to have a global configuration
- file, but it will be more comfortable for your
- users if they find a working default configuration.
-Description-es: ¿Crear una configuración por defecto para xawtv?
- Puede crear un fichero de configuración para xawtv general para su
- sistema con valores razonables para el país en el que vive (el sistema
- de televisión que se utiliza por ejemplo).
- .
- No es obligatorio tener un fichero de configuración global, pero será
- más cómodo para sus usuarios encontrarse una configuración por defecto
- que funciona.
-
-Template: xawtv/tvnorm
-Type: select
-Choices: PAL, SECAM, NTSC
-Description: Which TV norm is used in your country?
-Description-es: ¿Qué sistema de televisión se usa en su país?
-
-Template: xawtv/freqtab
-Type: select
-Choices: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast
-Description: Which frequency table should be used?
- A frequency table is just a list of TV channel
- names/numbers and the corresponding broadcast
- frequencies for these channels. Different regions
- use different standards here...
-Description-es: ¿Que tabla de frecuencias se debería usar?
- Una tabla de frecuencias es sólo una lista de nombres/números de
- canales de televisión y sus correspondientes frecuencias de emisión.
- Diferentes regiones utilizan diferentes estándares para esto...
-
-Template: xawtv/channel-scan
-Type: boolean
-Default: yes
-Description: scan for TV stations?
- I can do a scan of all channels and put a list of
- the TV stations I've found into the config file.
- .
- This requires a working bttv driver. If bttv isn't
- configured correctly I might not find the TV stations.
- .
- I'll try to pick up the channel names from videotext.
- This will work with PAL only.
-Description-es: ¿Buscar cadenas de televisión?
- Puedo realizar una búsqueda de todos los canales y poner una lista de
- las cadenas de televisión encontradas en el fichero de configuración.
- .
- Esto requiere un controlador bttv que funcione. Si bttv no se encuentra
- configurado correctamente puede que no encuentre las cadenas de
- televisión.
- .
- Trataré de obtener los nombres de los canales del teletexto. Esto sólo
- funcionará con PAL.
diff --git a/debian/xawtv.templates b/debian/xawtv.templates
index df24fd0..62698b0 100644
--- a/debian/xawtv.templates
+++ b/debian/xawtv.templates
@@ -1,15 +1,12 @@
Template: xawtv/makedev
Type: boolean
Default: true
-Description: Create video4linux (/dev/video*) special files?
-Description-da: Opret video4linux (/dev/video*) specielle filer?
-Description-de: Sollen Geräte-Dateien (/dev/video*) für video4linux erstellt werden?
-Description-es: ¿Crear los ficheros especiales video4linux (/dev/video*)?
+_Description: Create video4linux (/dev/video*) special files?
Template: xawtv/channel-scan
Type: boolean
Default: yes
-Description: scan for TV stations?
+_Description: scan for TV stations?
I can do a scan of all channels and put a list of the TV stations I've
found into the config file.
.
@@ -18,48 +15,16 @@ Description: scan for TV stations?
.
I'll try to pick up the channel names from videotext. This will work with
PAL only.
-Description-da: Skan efter TV stationer?
- Jeg kan lave en skanning efter alle kanaler og putte dem i en liste af de
- TV stationer jeg har fundet, ind i en konfigurations fil.
- .
- Dette kræver en virkende bttv driver. Hvis bttv ikke er korrekt
- konfigureret, vil du måske ikke finde TV stationerne.
- .
- Jeg vil prøve at finde kanal navne fra videotext. Dette vil kun virke med
- PAL.
-Description-de: Soll nach TV-Stationen gesucht werden?
- Ich kann einen Suche nach Kanälen durchführen und eine Liste der
- gefundenen TV-Stationen in die Konfigurationsdatei schreiben.
- .
- Dafür ist ein funktionierender BTTV-Treiber erforderlich. Wenn BTTV nicht
- richtig eingerichtet ist, werde ich keine Stationen finden können.
- .
- Ich werde versuchen, die Namen der Kanäle aus dem Videotext herauszulesen.
- Dies funktioniert nur mit PAL.
-Description-es: ¿Buscar cadenas de televisión?
- Puedo realizar una búsqueda de todos los canales y poner una lista de las
- cadenas de televisión encontradas en el fichero de configuración.
- .
- Esto requiere un controlador bttv que funcione. Si bttv no se encuentra
- configurado correctamente puede que no encuentre las cadenas de
- televisión.
- .
- Trataré de obtener los nombres de los canales del teletexto. Esto sólo
- funcionará con PAL.
Template: xawtv/tvnorm
Type: select
-Choices: PAL, SECAM, NTSC
-Choices-da: PAL, SECAM, NTSC
-Description: Which TV norm is used in your country?
-Description-da: Hvilken TV norm er brugt i dit land?
-Description-de: Welche TV-Norm benutzt man in ihrem Land?
-Description-es: ¿Qué sistema de televisión se usa en su país?
+_Choices: PAL, SECAM, NTSC
+_Description: Which TV norm is used in your country?
Template: xawtv/build-config
Type: boolean
Default: false
-Description: Create a default configuration for xawtv?
+_Description: Create a default configuration for xawtv?
You can create a system-wide configuration file for xawtv with reasonable
default values for the country you live in (which TV norm is used for
example).
@@ -67,48 +32,11 @@ Description: Create a default configuration for xawtv?
It is not required to have a global configuration file, but it will be
more comfortable for your users if they find a working default
configuration.
-Description-da: Opret en standard konfigurations fil til xawtv?
- Du kan oprette en system-bred konfigurations fil til xawtv med fornuftige
- standard værdier for landet du lever i (f.eks. hvilken TV norm der bliver
- brugt i dit land).
- .
- Det er ikke krævet at have en global konfigurations fil, men det vil gøre
- det mere behageligt for dine brugere, hvis de finder en standard virkende
- konfiguration.
-Description-de: Soll eine Standard-Konfiguration für xawtv erstellt werden?
- Sie können für xawtv eine systemweite Konfigurationsdatei erstellen, die
- vernünftige Voreinstellungen für ihr Land enthält (z.B. welche TV-Norm
- benutzt wird).
- .
- Eine globale Konfigurationsdatei ist nicht unbedingt erforderlich, aber es
- ist für die Benutzer sicherlich angenehm, gleich eine funktionierende
- Konfiguration vorzufinden.
-Description-es: ¿Crear una configuración por defecto para xawtv?
- Puede crear un fichero de configuración para xawtv general para su sistema
- con valores razonables para el país en el que vive (el sistema de
- televisión que se utiliza por ejemplo).
- .
- No es obligatorio tener un fichero de configuración global, pero será más
- cómodo para sus usuarios encontrarse una configuración por defecto que
- funciona.
Template: xawtv/freqtab
Type: select
-Choices: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast
-Choices-da: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast
-Description: Which frequency table should be used?
+_Choices: us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, europe-east, italy, newzealand, australia, ireland, france, china-bcast
+_Description: Which frequency table should be used?
A frequency table is just a list of TV channel names/numbers and the
corresponding broadcast frequencies for these channels. Different regions
use different standards here...
-Description-da: Hvilken frekvens tabel skal bruges?
- En frekvens tabel er bare en liste af kanal navne/tal og de tilsvarende
- frekvenser for disse kanaler. Forskellige regioner bruger forskellige
- standarder her...
-Description-de: Welche Frequenzen-Tabelle soll benutzt werden?
- Eine Frequenzen-Tabelle ist einfach nur eine Liste der TV-Kanäle (Namen
- oder Nummern) mit dazugehörigen Frequenzen. Verschiedene Regionen
- verwenden unterschiedliche Standards.
-Description-es: ¿Que tabla de frecuencias se debería usar?
- Una tabla de frecuencias es sólo una lista de nombres/números de canales
- de televisión y sus correspondientes frecuencias de emisión. Diferentes
- regiones utilizan diferentes estándares para esto...
diff --git a/vbistuff/alevtd.c b/vbistuff/alevtd.c
index 40bc944..4db63bb 100644
--- a/vbistuff/alevtd.c
+++ b/vbistuff/alevtd.c
@@ -289,6 +289,12 @@ xerror(int loglevel, char *txt, char *peerhost)
}
}
+static void
+dummy_handler(vbi_event *ev, void *unused)
+{
+ return;
+}
+
/* ---------------------------------------------------------------------- */
/* main loop */
@@ -584,7 +590,7 @@ main(int argc, char *argv[])
canonicalhost = 1;
/* fall through */
case 'n':
- strcpy(server_host,optarg);
+ strncpy(server_host,optarg,sizeof(server_host)-1);
break;
case 'i':
listen_ip = optarg;
@@ -628,6 +634,8 @@ main(int argc, char *argv[])
}
if (debug)
vbi_event_handler_add(vbi->dec,~0,vbi_dump_event,vbi);
+ else
+ vbi_event_handler_add(vbi->dec,~0,dummy_handler,vbi);
/* bind to socket */
slisten = -1;
diff --git a/x11/MoTV-fr b/x11/MoTV-fr
index 91f61ee..518a07a 100644
--- a/x11/MoTV-fr
+++ b/x11/MoTV-fr
@@ -1,260 +1,260 @@
-
-! ----------------------------------------------------------------------------
-! some standard motif stuff [i18n]
-
-!*.cancelLabelString: Annuler
-!*.applyLabelString: Appliquer
-!*.XmFileSelectionBox.dirListLabelString: Dossiers
-!*.XmFileSelectionBox.fileListLabelString: Fichiers
-!*.XmFileSelectionBox.selectionLabelString: Sélection
-
-
-! ----------------------------------------------------------------------------
-! strings [i18n]
-
-MoTV.about_box_popup.title: A propos de motv
-MoTV*about_box_popup*messageString: \
- motv - application TV en Motif \n\
- \n\
- (c) 2002 Gerd Knorr <kraxel@bytesex.org>
-
-MoTV.errbox_popup.title: Erreurs
-
-control*menubar*fileM.tearOffTitle: Fichier
-control*menubar*editM.tearOffTitle: Edition
-control*menubar*toolsM.tearOffTitle: Outils
-control*menubar*tuneM.tearOffTitle: Contrôle du syntoniseur
-control*menubar*grabM.tearOffTitle: Capturer image
-control*menubar*ratioM.tearOffTitle: Proportions image
-control*menubar*launchM.tearOffTitle: Lancer
-control*menubar*subM.tearOffTitle: Soustitres
-control*menubar*stationsM.tearOffTitle: Emetteurs TV
-control*menubar*optionsM.tearOffTitle: Options
-control*menubar*helpM.tearOffTitle: Aide
-control*menubar*captureM.tearOffTitle: Capture
-control*menubar*freqM.tearOffTitle: Table de fréquences
-control*menubar*inputM.tearOffTitle: Entrée
-control*menubar*normM.tearOffTitle: Norme TV
-
-control*menubar.file.labelString: Fichier
-control*menubar.file.mnemonic: F
-control*menubar.edit.labelString: Edition
-control*menubar.edit.mnemonic: E
-control*menubar.tools.labelString: Outils
-control*menubar.tools.mnemonic: T
-control*menubar*tune.labelString: Syntoniseur
-control*menubar*grab.labelString: Capturer image
-control*menubar*ratio.labelString: Proportions image
-control*menubar*launch.labelString: Lancer
-control*menubar*sub.labelString: Soustitres
-control*menubar.stations.labelString: Chaînes
-control*menubar.stations.mnemonic: C
-control*menubar.options.labelString: Options
-control*menubar.options.mnemonic: O
-control*menubar.filter.labelString: Filtre
-control*menubar.filter.mnemonic: F
-control*menubar.help.labelString: Aide
-control*menubar.help.mnemonic: A
-
-! file menu
-control*menubar*rec.labelString: Enregistrer film ...
-control*menubar*rec.mnemonic: R
-control*menubar*rec.acceleratorText: R
-control*menubar*rec.accelerator: <Key>R
-control*menubar*quit.labelString: Quitte
-control*menubar*quit.mnemonic: Q
-control*menubar*quit.acceleratorText: Q
-control*menubar*quit.accelerator: <Key>Q
-
-! edit menu
-control*menubar*copy.labelString: Copier
-control*menubar*copy.mnemonic: C
-control*menubar*copy.acceleratorText: Ctrl+C
-control*menubar*copy.accelerator: Ctrl<Key>C
-
-! tools menu
-control*menubar*mute.labelString: Couper le son
-control*menubar*mute.mnemonic: a
-control*menubar*mute.acceleratorText: A
-control*menubar*mute.accelerator: <Key>A
-control*menubar*full.labelString: Plein Ecran
-control*menubar*full.mnemonic: F
-control*menubar*full.acceleratorText: F
-control*menubar*full.accelerator: <Key>F
-control*menubar*ontop.labelString: Toujours visible
-control*menubar*ontop.mnemonic: T
-control*menubar*ontop.acceleratorText: T
-control*menubar*ontop.accelerator: <Key>T
-control*menubar*levels.labelString: Moniteur du niveau d'enregistrement ...
-control*menubar*levels.mnemonic: l
-control*menubar*levels.acceleratorText: L
-control*menubar*levels.accelerator: <Key>L
-control*menubar*st_up.labelString: Emetteur suivant
-control*menubar*st_up.acceleratorText: page suivante
-control*menubar*st_dn.labelString: Emetteur précédent
-control*menubar*st_dn.acceleratorText: page précédente
-
-control*menubar*ch_up.labelString: Fréquence suivante
-control*menubar*ch_up.acceleratorText: haut
-control*menubar*ch_dn.labelString: Fréquence précédente
-control*menubar*ch_dn.acceleratorText: bas
-control*menubar*fi_up.labelString: Syntonisation fine +
-control*menubar*fi_up.acceleratorText: droite
-control*menubar*fi_dn.labelString: Syntonisation fine -
-control*menubar*fi_dn.acceleratorText: gauche
-
-control*menubar*ppm_f.labelString: PPM, taille maximum
-control*menubar*ppm_f.acceleratorText: G
-control*menubar*ppm_f.accelerator: ~Ctrl<Key>G
-control*menubar*ppm_w.labelString: PPM, taille de la fenêtre
-control*menubar*ppm_w.acceleratorText: Ctrl+G
-control*menubar*ppm_w.accelerator: Ctrl<Key>G
-control*menubar*jpg_f.labelString: JPEG, taille maximum
-control*menubar*jpg_f.mnemonic: J
-control*menubar*jpg_f.acceleratorText: J
-control*menubar*jpg_f.accelerator: ~Ctrl<Key>J
-control*menubar*jpg_w.labelString: JPEG, taille de la fenêtre
-control*menubar*jpg_w.acceleratorText: Ctrl+J
-control*menubar*jpg_w.accelerator: Ctrl<Key>J
-
-control*menubar*r_no.labelString: pas de proportion
-control*menubar*r_no.mnemonic: n
-control*menubar*r_43.labelString: 4:3
-control*menubar*r_43.mnemonic: 4
-
-control*menubar*s_off.labelString: désactiver
-control*menubar*s_150.labelString: page 150
-control*menubar*s_150.mnemonic: 1
-control*menubar*s_333.labelString: page 333
-control*menubar*s_333.mnemonic: 3
-control*menubar*s_777.labelString: page 777
-control*menubar*s_777.mnemonic: 7
-control*menubar*s_801.labelString: page 801
-control*menubar*s_801.mnemonic: 0
-control*menubar*s_888.labelString: page 888
-control*menubar*s_888.mnemonic: 8
-
-! options menu
-control*menubar*add.labelString: Ajouter émetteur ...
-control*menubar*add.mnemonic: A
-control*menubar*scan.labelString: Rechercher émetteur ...
-control*menubar*pref.labelString: Preférences ...
-control*menubar*pref.mnemonic: P
-control*menubar*save.labelString: Sauver configuration
-control*menubar*save.mnemonic: S
-
-control*menubar*capture.labelString: Capturer
-control*menubar*capture.mnemonic: C
-control*menubar*freq.labelString: Table de fréquences
-control*menubar*freq.mnemonic: F
-control*menubar*scale.labelString: Echèlle ...
-control*menubar*scale.mnemonic: S
-control*menubar*scale.acceleratorText: S
-control*menubar*scale.accelerator: <Key>S
-
-control*menubar*input.labelString: Entrée
-control*menubar*input.mnemonic: I
-control*menubar*norm.labelString: Norme TV
-control*menubar*norm.mnemonic: N
-
-! filter menu
-control*menubar*fnone.labelString: Pas de filtre
-control*menubar*fnone.mnemonic: N
-
-! help menu
-control*menubar*man.labelString: Afficher la page de man
-control*menubar*man.mnemonic: m
-control*menubar*about.labelString: A propos ...
-control*menubar*about.mnemonic: A
-
-! tooltips (needs openmotif 2.2)
-control*tool.prev.toolTipString: Emetteur précédent
-control*tool.next.toolTipString: Emetteur suivant
-control*tool.snap.toolTipString: Capture une image
-control*tool.movie.toolTipString: Enregistre un film
-control*tool.mute.toolTipString: Coupe le son
-control*tool.exit.toolTipString: Quitte
-
-control*box.XmPushButton*menu.del.labelString: Supprimer
-control*box.XmPushButton*menu.edit.labelString: Editer ...
-
-! channel scan
-*chscan_popup.title: Rechercher un émetteur
-*chscan_popup*okLabelString: Commencer
-*chscan_popup*hints.labelString: \
- Vous pouvez me faire rechercher tous\n\
- les émetteurs disponibles ici. Ceci\n\
- va créer une nouvelle liste d'émetteurs\n\
- à partir de zéro, votre liste actuelle\n\
- sera perdue.\n\
- \n\
- Assurez-vous d'avoir choisi la bonne\n\
- norme TV et la table de fréquences\n\
- d'abord (c'est aussi dans le menu des\n\
- options), sinon la recherche ne\n\
- trouvera aucun émetteur...\n\
- \n
-
-! channel properties
-*prop_popup.title: Editer émetteur
-*prop_popup*rc.nameL.labelString: Nom de l'émetteur
-*prop_popup*rc.keyL.labelString: Raccourci clavier
-*prop_popup*rc.groupL.labelString: [en] Group
-*prop_popup*rc.channelL.labelString: Emetteur
-*prop_popup*rc.buttons.ok.labelString: OK
-*prop_popup*rc.buttons.cancel.labelString: Annuler
-*prop_popup*no_name_popup.title: Erreur
-*prop_popup*no_name_popup*messageString: \
- Vous devez donner un nom à l'émetteur
-
-! preferences
-*pref_popup.title: Preférences
-*pref_popup*okLabelString: Sauver
-*pref_popup*fsL.labelString: Plein écran
-*pref_popup*fsT.labelString: Permettre le changement de résolution
-*pref_popup*fsO.labelString: Résolution:
-*pref_popup*mixL.labelString: Volume (redémarrer motv pour appliquer)
-*pref_popup*mixT.labelString: Utilise le périphérique de mixage pour régler le volume
-*pref_popup*mix1O.labelString: périphérique de mixage:
-*pref_popup*mix2O.labelString: entrée de mixage:
-*pref_popup*optL.labelString: Options
-*pref_popup*osd.labelString: Utiliser la surimpression en mode plein écran
-*pref_popup*keypad-ntsc.labelString: pavé numérique : mode ntsc
-*pref_popup*keypad-partial.labelString: \
- pavé numérique : permettre partition (bascule sur la première touche)
-*pref_popup*jpeg.label.labelString: Qualité JPEG :
-
-scale.title: Contrôles d'échelle
-scale*volume.titleString: Volume
-scale*bright.titleString: Luminosité
-scale*hue.titleString: Hue
-scale*color.titleString: Saturation
-scale*contrast.titleString: Contraste
-
-levels.title: Moniteur
-levels*enable.labelstring: activer
-
-streamer.title: enregistrer un film
-streamer*driverL.labelString: Format de sortie
-streamer*driver.labelString: Pilote :
-streamer*videoL.labelString: Options video
-streamer*video.labelString: Format :
-streamer*fpsL.labelString: ips :
-streamer*audioL.labelString: Options audio
-streamer*audio.labelString: Format :
-streamer*rateL.labelString: Echantillonage :
-streamer*fileL.labelString: Noms des fichiers
-streamer*fvideoL.labelString: Video :
-streamer*faudioL.labelString: Audio :
-streamer*status.labelString: corrigez-moi
-
-streamer*files.labelString: Naviguer ...
-streamer*buttons.rec.labelString: Enregistrer
-streamer*buttons.stop.labelString: Arrêter
-streamer*buttons.play.labelString: Lire
-streamer*buttons.cancel.labelString: Fermer
-
-MoTV.man_popup.title: Page de manuel
-MoTV.man_popup*okLabelString: Fermer la fenêtre
-MoTV.man_popup*label.labelString: attendez svp ...
-
+
+! ----------------------------------------------------------------------------
+! some standard motif stuff [i18n]
+
+!*.cancelLabelString: Annuler
+!*.applyLabelString: Appliquer
+!*.XmFileSelectionBox.dirListLabelString: Dossiers
+!*.XmFileSelectionBox.fileListLabelString: Fichiers
+!*.XmFileSelectionBox.selectionLabelString: Sélection
+
+
+! ----------------------------------------------------------------------------
+! strings [i18n]
+
+MoTV.about_box_popup.title: A propos de motv
+MoTV*about_box_popup*messageString: \
+ motv - application TV en Motif \n\
+ \n\
+ (c) 2002 Gerd Knorr <kraxel@bytesex.org>
+
+MoTV.errbox_popup.title: Erreurs
+
+control*menubar*fileM.tearOffTitle: Fichier
+control*menubar*editM.tearOffTitle: Edition
+control*menubar*toolsM.tearOffTitle: Outils
+control*menubar*tuneM.tearOffTitle: Contrôle du syntoniseur
+control*menubar*grabM.tearOffTitle: Capturer image
+control*menubar*ratioM.tearOffTitle: Proportions image
+control*menubar*launchM.tearOffTitle: Lancer
+control*menubar*subM.tearOffTitle: Soustitres
+control*menubar*stationsM.tearOffTitle: Emetteurs TV
+control*menubar*optionsM.tearOffTitle: Options
+control*menubar*helpM.tearOffTitle: Aide
+control*menubar*captureM.tearOffTitle: Capture
+control*menubar*freqM.tearOffTitle: Table de fréquences
+control*menubar*inputM.tearOffTitle: Entrée
+control*menubar*normM.tearOffTitle: Norme TV
+
+control*menubar.file.labelString: Fichier
+control*menubar.file.mnemonic: F
+control*menubar.edit.labelString: Edition
+control*menubar.edit.mnemonic: E
+control*menubar.tools.labelString: Outils
+control*menubar.tools.mnemonic: T
+control*menubar*tune.labelString: Syntoniseur
+control*menubar*grab.labelString: Capturer image
+control*menubar*ratio.labelString: Proportions image
+control*menubar*launch.labelString: Lancer
+control*menubar*sub.labelString: Soustitres
+control*menubar.stations.labelString: Chaînes
+control*menubar.stations.mnemonic: C
+control*menubar.options.labelString: Options
+control*menubar.options.mnemonic: O
+control*menubar.filter.labelString: Filtre
+control*menubar.filter.mnemonic: F
+control*menubar.help.labelString: Aide
+control*menubar.help.mnemonic: A
+
+! file menu
+control*menubar*rec.labelString: Enregistrer film ...
+control*menubar*rec.mnemonic: R
+control*menubar*rec.acceleratorText: R
+control*menubar*rec.accelerator: <Key>R
+control*menubar*quit.labelString: Quitte
+control*menubar*quit.mnemonic: Q
+control*menubar*quit.acceleratorText: Q
+control*menubar*quit.accelerator: <Key>Q
+
+! edit menu
+control*menubar*copy.labelString: Copier
+control*menubar*copy.mnemonic: C
+control*menubar*copy.acceleratorText: Ctrl+C
+control*menubar*copy.accelerator: Ctrl<Key>C
+
+! tools menu
+control*menubar*mute.labelString: Couper le son
+control*menubar*mute.mnemonic: a
+control*menubar*mute.acceleratorText: A
+control*menubar*mute.accelerator: <Key>A
+control*menubar*full.labelString: Plein Ecran
+control*menubar*full.mnemonic: F
+control*menubar*full.acceleratorText: F
+control*menubar*full.accelerator: <Key>F
+control*menubar*ontop.labelString: Toujours visible
+control*menubar*ontop.mnemonic: T
+control*menubar*ontop.acceleratorText: T
+control*menubar*ontop.accelerator: <Key>T
+control*menubar*levels.labelString: Moniteur du niveau d'enregistrement ...
+control*menubar*levels.mnemonic: l
+control*menubar*levels.acceleratorText: L
+control*menubar*levels.accelerator: <Key>L
+control*menubar*st_up.labelString: Emetteur suivant
+control*menubar*st_up.acceleratorText: page suivante
+control*menubar*st_dn.labelString: Emetteur précédent
+control*menubar*st_dn.acceleratorText: page précédente
+
+control*menubar*ch_up.labelString: Fréquence suivante
+control*menubar*ch_up.acceleratorText: haut
+control*menubar*ch_dn.labelString: Fréquence précédente
+control*menubar*ch_dn.acceleratorText: bas
+control*menubar*fi_up.labelString: Syntonisation fine +
+control*menubar*fi_up.acceleratorText: droite
+control*menubar*fi_dn.labelString: Syntonisation fine -
+control*menubar*fi_dn.acceleratorText: gauche
+
+control*menubar*ppm_f.labelString: PPM, taille maximum
+control*menubar*ppm_f.acceleratorText: G
+control*menubar*ppm_f.accelerator: ~Ctrl<Key>G
+control*menubar*ppm_w.labelString: PPM, taille de la fenêtre
+control*menubar*ppm_w.acceleratorText: Ctrl+G
+control*menubar*ppm_w.accelerator: Ctrl<Key>G
+control*menubar*jpg_f.labelString: JPEG, taille maximum
+control*menubar*jpg_f.mnemonic: J
+control*menubar*jpg_f.acceleratorText: J
+control*menubar*jpg_f.accelerator: ~Ctrl<Key>J
+control*menubar*jpg_w.labelString: JPEG, taille de la fenêtre
+control*menubar*jpg_w.acceleratorText: Ctrl+J
+control*menubar*jpg_w.accelerator: Ctrl<Key>J
+
+control*menubar*r_no.labelString: pas de proportion
+control*menubar*r_no.mnemonic: n
+control*menubar*r_43.labelString: 4:3
+control*menubar*r_43.mnemonic: 4
+
+control*menubar*s_off.labelString: désactiver
+control*menubar*s_150.labelString: page 150
+control*menubar*s_150.mnemonic: 1
+control*menubar*s_333.labelString: page 333
+control*menubar*s_333.mnemonic: 3
+control*menubar*s_777.labelString: page 777
+control*menubar*s_777.mnemonic: 7
+control*menubar*s_801.labelString: page 801
+control*menubar*s_801.mnemonic: 0
+control*menubar*s_888.labelString: page 888
+control*menubar*s_888.mnemonic: 8
+
+! options menu
+control*menubar*add.labelString: Ajouter émetteur ...
+control*menubar*add.mnemonic: A
+control*menubar*scan.labelString: Rechercher émetteur ...
+control*menubar*pref.labelString: Preférences ...
+control*menubar*pref.mnemonic: P
+control*menubar*save.labelString: Sauver configuration
+control*menubar*save.mnemonic: S
+
+control*menubar*capture.labelString: Capturer
+control*menubar*capture.mnemonic: C
+control*menubar*freq.labelString: Table de fréquences
+control*menubar*freq.mnemonic: F
+control*menubar*scale.labelString: Echèlle ...
+control*menubar*scale.mnemonic: S
+control*menubar*scale.acceleratorText: S
+control*menubar*scale.accelerator: <Key>S
+
+control*menubar*input.labelString: Entrée
+control*menubar*input.mnemonic: I
+control*menubar*norm.labelString: Norme TV
+control*menubar*norm.mnemonic: N
+
+! filter menu
+control*menubar*fnone.labelString: Pas de filtre
+control*menubar*fnone.mnemonic: N
+
+! help menu
+control*menubar*man.labelString: Afficher la page de man
+control*menubar*man.mnemonic: m
+control*menubar*about.labelString: A propos ...
+control*menubar*about.mnemonic: A
+
+! tooltips (needs openmotif 2.2)
+control*tool.prev.toolTipString: Emetteur précédent
+control*tool.next.toolTipString: Emetteur suivant
+control*tool.snap.toolTipString: Capture une image
+control*tool.movie.toolTipString: Enregistre un film
+control*tool.mute.toolTipString: Coupe le son
+control*tool.exit.toolTipString: Quitte
+
+control*box.XmPushButton*menu.del.labelString: Supprimer
+control*box.XmPushButton*menu.edit.labelString: Editer ...
+
+! channel scan
+*chscan_popup.title: Rechercher un émetteur
+*chscan_popup*okLabelString: Commencer
+*chscan_popup*hints.labelString: \
+ Vous pouvez me faire rechercher tous\n\
+ les émetteurs disponibles ici. Ceci\n\
+ va créer une nouvelle liste d'émetteurs\n\
+ à partir de zéro, votre liste actuelle\n\
+ sera perdue.\n\
+ \n\
+ Assurez-vous d'avoir choisi la bonne\n\
+ norme TV et la table de fréquences\n\
+ d'abord (c'est aussi dans le menu des\n\
+ options), sinon la recherche ne\n\
+ trouvera aucun émetteur...\n\
+ \n
+
+! channel properties
+*prop_popup.title: Editer émetteur
+*prop_popup*rc.nameL.labelString: Nom de l'émetteur
+*prop_popup*rc.keyL.labelString: Raccourci clavier
+*prop_popup*rc.groupL.labelString: [en] Group
+*prop_popup*rc.channelL.labelString: Emetteur
+*prop_popup*rc.buttons.ok.labelString: OK
+*prop_popup*rc.buttons.cancel.labelString: Annuler
+*prop_popup*no_name_popup.title: Erreur
+*prop_popup*no_name_popup*messageString: \
+ Vous devez donner un nom à l'émetteur
+
+! preferences
+*pref_popup.title: Preférences
+*pref_popup*okLabelString: Sauver
+*pref_popup*fsL.labelString: Plein écran
+*pref_popup*fsT.labelString: Permettre le changement de résolution
+*pref_popup*fsO.labelString: Résolution:
+*pref_popup*mixL.labelString: Volume (redémarrer motv pour appliquer)
+*pref_popup*mixT.labelString: Utilise le périphérique de mixage pour régler le volume
+*pref_popup*mix1O.labelString: périphérique de mixage:
+*pref_popup*mix2O.labelString: entrée de mixage:
+*pref_popup*optL.labelString: Options
+*pref_popup*osd.labelString: Utiliser la surimpression en mode plein écran
+*pref_popup*keypad-ntsc.labelString: pavé numérique : mode ntsc
+*pref_popup*keypad-partial.labelString: \
+ pavé numérique : permettre partition (bascule sur la première touche)
+*pref_popup*jpeg.label.labelString: Qualité JPEG :
+
+scale.title: Contrôles d'échelle
+scale*volume.titleString: Volume
+scale*bright.titleString: Luminosité
+scale*hue.titleString: Hue
+scale*color.titleString: Saturation
+scale*contrast.titleString: Contraste
+
+levels.title: Moniteur
+levels*enable.labelstring: activer
+
+streamer.title: enregistrer un film
+streamer*driverL.labelString: Format de sortie
+streamer*driver.labelString: Pilote :
+streamer*videoL.labelString: Options video
+streamer*video.labelString: Format :
+streamer*fpsL.labelString: ips :
+streamer*audioL.labelString: Options audio
+streamer*audio.labelString: Format :
+streamer*rateL.labelString: Echantillonage :
+streamer*fileL.labelString: Noms des fichiers
+streamer*fvideoL.labelString: Video :
+streamer*faudioL.labelString: Audio :
+streamer*status.labelString: corrigez-moi
+
+streamer*files.labelString: Naviguer ...
+streamer*buttons.rec.labelString: Enregistrer
+streamer*buttons.stop.labelString: Arrêter
+streamer*buttons.play.labelString: Lire
+streamer*buttons.cancel.labelString: Fermer
+
+MoTV.man_popup.title: Page de manuel
+MoTV.man_popup*okLabelString: Fermer la fenêtre
+MoTV.man_popup*label.labelString: attendez svp ...
+
diff --git a/x11/blit.c b/x11/blit.c
index 397ecd9..56434f7 100644
--- a/x11/blit.c
+++ b/x11/blit.c
@@ -943,6 +943,7 @@ void blit_putframe(struct blit_state *st, struct ng_video_buf *buf)
case STATUS_BROKEN:
if (debug > 1)
fprintf(stderr,"blit: putframe: oops: status = %d\n",st->status);
+ ng_release_video_buf(buf);
break;
}
}
diff --git a/x11/xt.c b/x11/xt.c
index 8972a81..e8407f4 100644
--- a/x11/xt.c
+++ b/x11/xt.c
@@ -1459,7 +1459,7 @@ x11_check_remote()
fprintf(stderr,"*");
/* catch unix sockets on FreeBSD */
- if (0 == length) {
+ if (0 == length || ss.ss_family == AF_UNIX) {
if (debug)
fprintf(stderr, " ok (unix socket)\n");
return;
diff --git a/x11/xv.c b/x11/xv.c
index ec2ff22..a712716 100644
--- a/x11/xv.c
+++ b/x11/xv.c
@@ -432,10 +432,12 @@ void xv_video_init(unsigned int port, int hwscan)
}
if (handle->xv_encoding != None) {
- xv_add_attr(handle, ATTR_ID_NORM, ATTR_TYPE_CHOICE,
- 0, norms, NULL);
- xv_add_attr(handle, ATTR_ID_INPUT, ATTR_TYPE_CHOICE,
- 0, inputs, NULL);
+ if (norms)
+ xv_add_attr(handle, ATTR_ID_NORM, ATTR_TYPE_CHOICE,
+ 0, norms, NULL);
+ if (inputs)
+ xv_add_attr(handle, ATTR_ID_INPUT, ATTR_TYPE_CHOICE,
+ 0, inputs, NULL);
}
#if 0
if (xv_colorkey != None) {
diff --git a/xawtv.spec b/xawtv.spec
index 4b50cf7..8643af9 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -1,7 +1,7 @@
Name: xawtv
Group: Applications/Multimedia
Autoreqprov: on
-Version: 3.88
+Version: 3.90
Release: 0
License: GPL
Summary: v4l applications

Privacy Policy