Bug#925936: release.debian.org: Would v4l-utils 1.16.5 match unblocking criteria?
Package: release.debian.org
Severity: normal
Hello,
the v4l-utils version in testing (1.16.3) contains some serious bugs:
* A double free in libdvbv5
* Uninitialized memory
* A FTBFS Bug for Ubuntu ARM architectures (Qt OpenGL ES vs. Desktop)
Upstream released 1.16.5 which is a bugfix release.
To get a overview about the commits please visit
https://git.linuxtv.org/v4l-utils.git/log/?h=stable-1.16
I also attach a debdiff (which is much noisier due to autoconf and
gettext changes).
Would you consider an unblock request for 1.16.5? Or should I pick just
the absolutely necessary patches and apply them to 1.16.3?
Thanks,
Gregor
-- System Information:
Debian Release: buster/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.19.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru v4l-utils-1.16.3/build-aux/ltmain.sh v4l-utils-1.16.5/build-aux/ltmain.sh
--- v4l-utils-1.16.3/build-aux/ltmain.sh 2018-12-15 19:17:02.000000000 +0100
+++ v4l-utils-1.16.5/build-aux/ltmain.sh 2019-03-28 20:39:53.000000000 +0100
@@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-6"
+VERSION="2.4.6 Debian-2.4.6-10"
package_revision=2.4.6
@@ -64,7 +64,7 @@
# libraries, which are installed to $pkgauxdir.
# Set a version string for this script.
-scriptversion=2015-10-04.22; # UTC
+scriptversion=2015-01-20.17; # UTC
# General shell script boiler plate, and helper functions.
# Written by Gary V. Vaughan, 2004
@@ -1091,57 +1091,6 @@
}
-# func_quote ARG
-# --------------
-# Aesthetically quote one ARG, store the result into $func_quote_result. Note
-# that we keep attention to performance here (so far O(N) complexity as long as
-# func_append is O(1)).
-func_quote ()
-{
- $debug_cmd
-
- func_quote_result=$1
-
- case $func_quote_result in
- *[\\\`\"\$]*)
- case $func_quote_result in
- *[\[\*\?]*)
- func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"`
- return 0
- ;;
- esac
-
- func_quote_old_IFS=$IFS
- for _G_char in '\' '`' '"' '$'
- do
- # STATE($1) PREV($2) SEPARATOR($3)
- set start "" ""
- func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy
- IFS=$_G_char
- for _G_part in $func_quote_result
- do
- case $1 in
- quote)
- func_append func_quote_result "$3$2"
- set quote "$_G_part" "\\$_G_char"
- ;;
- start)
- set first "" ""
- func_quote_result=
- ;;
- first)
- set quote "$_G_part" ""
- ;;
- esac
- done
- IFS=$func_quote_old_IFS
- done
- ;;
- *) ;;
- esac
-}
-
-
# func_quote_for_eval ARG...
# --------------------------
# Aesthetically quote ARGs to be evaled later.
@@ -1158,8 +1107,12 @@
func_quote_for_eval_unquoted_result=
func_quote_for_eval_result=
while test 0 -lt $#; do
- func_quote "$1"
- _G_unquoted_arg=$func_quote_result
+ case $1 in
+ *[\\\`\"\$]*)
+ _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+ *)
+ _G_unquoted_arg=$1 ;;
+ esac
if test -n "$func_quote_for_eval_unquoted_result"; then
func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
else
@@ -2188,7 +2141,7 @@
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname $scriptversion Debian-2.4.6-6
+ version: $progname $scriptversion Debian-2.4.6-10
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
@@ -5397,8 +5350,7 @@
if test \"\$libtool_execute_magic\" != \"$magic\"; then
file=\"\$0\""
- func_quote "$ECHO"
- qECHO=$func_quote_result
+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
$ECHO "\
# A function that is used when there is no print builtin or printf.
@@ -7415,10 +7367,11 @@
# -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
# -fsanitize=* Clang/GCC memory and address sanitizer
+ # -fuse-ld=* Linker select flags for GCC
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
- -specs=*|-fsanitize=*)
+ -specs=*|-fsanitize=*|-fuse-ld=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
@@ -10655,8 +10608,8 @@
relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
fi
done
- func_quote "(cd `pwd`; $relink_command)"
- relink_command=$func_quote_result
+ relink_command="(cd `pwd`; $relink_command)"
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
@@ -10902,8 +10855,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- func_quote "$relink_command"
- relink_command=$func_quote_result
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
if test yes = "$hardcode_automatic"; then
relink_command=
fi
diff -Nru v4l-utils-1.16.3/ChangeLog v4l-utils-1.16.5/ChangeLog
--- v4l-utils-1.16.3/ChangeLog 2018-12-15 19:16:16.000000000 +0100
+++ v4l-utils-1.16.5/ChangeLog 2019-03-28 20:38:13.000000000 +0100
@@ -1,3 +1,29 @@
+v4l-utils-1.16.5
+----------------
+
+Mauro Carvalho Chehab (2):
+ Update my e-mail on all places
+ dvb-sat: rename Astra 1E to Astra 19.2 E and move it to beginning
+
+
+v4l-utils-1.16.4
+----------------
+
+Gregor Jasny (2):
+ Qt5: test for Desktop OpenGL presence
+ Qt5: fixup Qt OpenGL automake conditionals
+
+Hans Verkuil (1):
+ dvbv5-zap.c: fix compile warning
+
+Mauro Carvalho Chehab (2):
+ dvbv5-tools: be sure to zero struct arguments
+ dvbv5-zap: improve program exit code
+
+Sean Young (1):
+ libdvbv5: leaks and double free in dvb_fe_open_fname()
+
+
v4l-utils-1.16.3
----------------
diff -Nru v4l-utils-1.16.3/configure v4l-utils-1.16.5/configure
--- v4l-utils-1.16.3/configure 2018-12-15 19:17:06.000000000 +0100
+++ v4l-utils-1.16.5/configure 2019-03-28 20:39:57.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for v4l-utils 1.16.3.
+# Generated by GNU Autoconf 2.69 for v4l-utils 1.16.5.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='v4l-utils'
PACKAGE_TARNAME='v4l-utils'
-PACKAGE_VERSION='1.16.3'
-PACKAGE_STRING='v4l-utils 1.16.3'
+PACKAGE_VERSION='1.16.5'
+PACKAGE_STRING='v4l-utils 1.16.5'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1565,7 +1565,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures v4l-utils 1.16.3 to adapt to many kinds of systems.
+\`configure' configures v4l-utils 1.16.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1636,7 +1636,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of v4l-utils 1.16.3:";;
+ short | recursive ) echo "Configuration of v4l-utils 1.16.5:";;
esac
cat <<\_ACEOF
@@ -1827,7 +1827,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-v4l-utils configure 1.16.3
+v4l-utils configure 1.16.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2367,7 +2367,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by v4l-utils $as_me 1.16.3, which was
+It was created by v4l-utils $as_me 1.16.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4611,7 +4611,7 @@
# Define the identity of the package.
PACKAGE='v4l-utils'
- VERSION='1.16.3'
+ VERSION='1.16.5'
cat >>confdefs.h <<_ACEOF
@@ -9596,6 +9596,12 @@
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
+ # flang / f18. f95 an alias for gfortran or flang on Debian
+ flang* | f18* | f95*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
@@ -21711,6 +21717,50 @@
fi
fi
if test "x$qt_pkgconfig_gl" = "xtrue"; then
+ SAVED_CXXFLAGS="${CXXFLAGS}"
+ CXXFLAGS="${CXXFLAGS} ${QT_CFLAGS} ${QT5GL_CFLAGS}"
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 Desktop OpenGL" >&5
+$as_echo_n "checking for Qt5 Desktop OpenGL... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#define GL_GLEXT_PROTOTYPES
+#define QT_NO_OPENGL_ES_2
+
+#include <QGLWidget>
+#include <QGLShader>
+#include <QGLShaderProgram>
+#include <QGLFunctions>
+
+#ifndef GL_UNSIGNED_INT_8_8_8_8
+#error Missing OpenGL Extensions
+#endif
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ qt_desktop_opengl=yes
+else
+ qt_desktop_opengl=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_desktop_opengl" >&5
+$as_echo "$qt_desktop_opengl" >&6; }
+ CXXFLAGS="${SAVED_CXXFLAGS}"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ fi
+
+ if test "x$qt_desktop_opengl" = "xyes"; then
QTGL_CFLAGS="$QT5GL_CFLAGS -fPIC"
QTGL_LIBS="$QT5GL_LIBS"
@@ -21729,8 +21779,8 @@
else
QT_VERSION="v5"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Qt5 OpenGL is not available" >&5
-$as_echo "$as_me: WARNING: Qt5 OpenGL is not available" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Qt5 Desktop OpenGL is not available" >&5
+$as_echo "$as_me: WARNING: Qt5 Desktop OpenGL is not available" >&2;}
fi
else
@@ -23684,7 +23734,7 @@
WITH_QV4L2_FALSE=
fi
- if test x${qt_pkgconfig_gl} = xtrue -a x$enable_qvidcap != xno; then
+ if test x${qt_desktop_opengl} = xyes -a x$enable_qvidcap != xno; then
WITH_QVIDCAP_TRUE=
WITH_QVIDCAP_FALSE='#'
else
@@ -23708,7 +23758,7 @@
WITH_V4L_WRAPPERS_FALSE=
fi
- if test x${qt_pkgconfig_gl} = xtrue; then
+ if test x${qt_desktop_opengl} = xyes; then
WITH_QTGL_TRUE=
WITH_QTGL_FALSE='#'
else
@@ -24522,7 +24572,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by v4l-utils $as_me 1.16.3, which was
+This file was extended by v4l-utils $as_me 1.16.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24588,7 +24638,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-v4l-utils config.status 1.16.3
+v4l-utils config.status 1.16.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru v4l-utils-1.16.3/configure.ac v4l-utils-1.16.5/configure.ac
--- v4l-utils-1.16.3/configure.ac 2018-12-15 19:14:58.000000000 +0100
+++ v4l-utils-1.16.5/configure.ac 2019-03-28 20:36:52.000000000 +0100
@@ -3,7 +3,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([v4l-utils],[1.16.3])
+AC_INIT([v4l-utils],[1.16.5])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
@@ -232,6 +232,32 @@
PKG_CHECK_MODULES(QT5GL, [Qt5OpenGL >= 5.0 gl], [qt_pkgconfig_gl=true], [qt_pkgconfig_gl=false])
fi
if test "x$qt_pkgconfig_gl" = "xtrue"; then
+ SAVED_CXXFLAGS="${CXXFLAGS}"
+ CXXFLAGS="${CXXFLAGS} ${QT_CFLAGS} ${QT5GL_CFLAGS}"
+ AC_LANG_PUSH([C++])
+ AC_MSG_CHECKING([for Qt5 Desktop OpenGL])
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+[[
+#define GL_GLEXT_PROTOTYPES
+#define QT_NO_OPENGL_ES_2
+
+#include <QGLWidget>
+#include <QGLShader>
+#include <QGLShaderProgram>
+#include <QGLFunctions>
+
+#ifndef GL_UNSIGNED_INT_8_8_8_8
+#error Missing OpenGL Extensions
+#endif
+]])],
+ [qt_desktop_opengl=yes],
+ [qt_desktop_opengl=no])
+ AC_MSG_RESULT([$qt_desktop_opengl])
+ CXXFLAGS="${SAVED_CXXFLAGS}"
+ AC_LANG_POP
+ fi
+
+ if test "x$qt_desktop_opengl" = "xyes"; then
QTGL_CFLAGS="$QT5GL_CFLAGS -fPIC"
QTGL_LIBS="$QT5GL_LIBS"
AC_SUBST(QT_CFLAGS)
@@ -248,7 +274,7 @@
else
QT_VERSION="v5"
fi
- AC_MSG_WARN(Qt5 OpenGL is not available)
+ AC_MSG_WARN(Qt5 Desktop OpenGL is not available)
fi
else
PKG_CHECK_MODULES(QT, [QtCore >= 4.0 QtGui >= 4.0], [qt_pkgconfig=true], [qt_pkgconfig=false])
@@ -492,10 +518,10 @@
AM_CONDITIONAL([WITH_DYN_LIBV4L], [test x$enable_dyn_libv4l != xno])
AM_CONDITIONAL([WITH_V4LUTILS], [test x$enable_v4l_utils != xno -a x$linux_os = xyes])
AM_CONDITIONAL([WITH_QV4L2], [test x${qt_pkgconfig} = xtrue -a x$enable_qv4l2 != xno])
-AM_CONDITIONAL([WITH_QVIDCAP], [test x${qt_pkgconfig_gl} = xtrue -a x$enable_qvidcap != xno])
+AM_CONDITIONAL([WITH_QVIDCAP], [test x${qt_desktop_opengl} = xyes -a x$enable_qvidcap != xno])
AM_CONDITIONAL([WITH_V4L_PLUGINS], [test x$enable_dyn_libv4l != xno -a x$enable_shared != xno])
AM_CONDITIONAL([WITH_V4L_WRAPPERS], [test x$enable_dyn_libv4l != xno -a x$enable_shared != xno])
-AM_CONDITIONAL([WITH_QTGL], [test x${qt_pkgconfig_gl} = xtrue])
+AM_CONDITIONAL([WITH_QTGL], [test x${qt_desktop_opengl} = xyes])
AM_CONDITIONAL([WITH_GCONV], [test x$enable_gconv = xyes -a x$enable_shared == xyes -a x$with_gconvdir != x -a -f $with_gconvdir/gconv-modules])
AM_CONDITIONAL([WITH_V4L2_CTL_LIBV4L], [test x${enable_v4l2_ctl_libv4l} != xno])
AM_CONDITIONAL([WITH_V4L2_CTL_STREAM_TO], [test x${enable_v4l2_ctl_stream_to} != xno])
diff -Nru v4l-utils-1.16.3/contrib/cobalt-ctl/Makefile v4l-utils-1.16.5/contrib/cobalt-ctl/Makefile
--- v4l-utils-1.16.3/contrib/cobalt-ctl/Makefile 2018-12-15 19:17:21.000000000 +0100
+++ v4l-utils-1.16.5/contrib/cobalt-ctl/Makefile 2019-03-28 20:40:13.000000000 +0100
@@ -214,7 +214,7 @@
DX_DOXYGEN = /usr/bin/doxygen
DX_DVIPS =
DX_EGREP = /bin/egrep
-DX_ENV = SRCDIR='.' PROJECT='v4l-utils' DOCDIR='doxygen-doc' VERSION='1.16.3' PERL_PATH='/usr/bin/perl' HAVE_DOT='YES' DOT_PATH='/usr/bin' GENERATE_MAN='NO' GENERATE_RTF='NO' GENERATE_XML='NO' GENERATE_HTMLHELP='NO' GENERATE_CHI='NO' GENERATE_HTML='YES' GENERATE_LATEX='NO'
+DX_ENV = SRCDIR='.' PROJECT='v4l-utils' DOCDIR='doxygen-doc' VERSION='1.16.5' PERL_PATH='/usr/bin/perl' HAVE_DOT='YES' DOT_PATH='/usr/bin' GENERATE_MAN='NO' GENERATE_RTF='NO' GENERATE_XML='NO' GENERATE_HTMLHELP='NO' GENERATE_CHI='NO' GENERATE_HTML='YES' GENERATE_LATEX='NO'
DX_FLAG_chi = 0
DX_FLAG_chm = 0
DX_FLAG_doc = 1
@@ -299,11 +299,11 @@
PACKAGE = v4l-utils
PACKAGE_BUGREPORT =
PACKAGE_NAME = v4l-utils
-PACKAGE_STRING = v4l-utils 1.16.3
+PACKAGE_STRING = v4l-utils 1.16.5
PACKAGE_TARNAME = v4l-utils
PACKAGE_URL =
-PACKAGE_VERSION = 1.16.3
-PATCH = 3
+PACKAGE_VERSION = 1.16.5
+PATCH = 5
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -331,7 +331,7 @@
UIC = uic
USE_NLS = yes
V4L_UTILS_VERSION =
-VERSION = 1.16.3
+VERSION = 1.16.5
X11_CFLAGS =
X11_LIBS = -lX11
XGETTEXT = /usr/bin/xgettext
diff -Nru v4l-utils-1.16.3/contrib/decode_tm6000/decode_tm6000.c v4l-utils-1.16.5/contrib/decode_tm6000/decode_tm6000.c
--- v4l-utils-1.16.3/contrib/decode_tm6000/decode_tm6000.c 2017-12-27 14:50:55.000000000 +0100
+++ v4l-utils-1.16.5/contrib/decode_tm6000/decode_tm6000.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,7 +1,7 @@
/*
decode_tm6000.c - decode multiplexed format from TM5600/TM6000 USB
- Copyright (C) 2007 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2007 Mauro Carvalho Chehab <mchehab@kernel.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
#include <errno.h>
const char *argp_program_version="decode_tm6000 version 0.0.1";
-const char *argp_program_bug_address="Mauro Carvalho Chehab <mchehab@infradead.org>";
+const char *argp_program_bug_address="Mauro Carvalho Chehab <mchehab@kernel.org>";
const char doc[]="Decodes tm6000 proprietary format streams";
const struct argp_option options[] = {
{"verbose", 'v', 0, 0, "enables debug messages", 0},
diff -Nru v4l-utils-1.16.3/contrib/parsers/au0828/parse_au0828.pl v4l-utils-1.16.5/contrib/parsers/au0828/parse_au0828.pl
--- v4l-utils-1.16.3/contrib/parsers/au0828/parse_au0828.pl 2017-12-27 14:50:55.000000000 +0100
+++ v4l-utils-1.16.5/contrib/parsers/au0828/parse_au0828.pl 2019-03-28 20:36:33.000000000 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/perl
use strict;
-# Copyright (C) 2014 Mauro Carvalho Chehab <m.chehab@samsung.com>
+# Copyright (C) 2014 Mauro Carvalho Chehab <mchehab@kernel.org>
# Copyright (c) 2014 Samsung Electronics Co., Ltd.
#
# This program is free software; you can redistribute it and/or modify
diff -Nru v4l-utils-1.16.3/contrib/parsers/parse_tcpdump_log.pl v4l-utils-1.16.5/contrib/parsers/parse_tcpdump_log.pl
--- v4l-utils-1.16.3/contrib/parsers/parse_tcpdump_log.pl 2017-12-27 14:50:55.000000000 +0100
+++ v4l-utils-1.16.5/contrib/parsers/parse_tcpdump_log.pl 2019-03-28 20:36:33.000000000 +0100
@@ -760,7 +760,7 @@
=head1 BUGS
-Report bugs to Mauro Carvalho Chehab <m.chehab@samsung.com>
+Report bugs to Mauro Carvalho Chehab <mchehab@kernel.org>
=head1 COPYRIGHT
diff -Nru v4l-utils-1.16.3/contrib/pci_traffic/README v4l-utils-1.16.5/contrib/pci_traffic/README
--- v4l-utils-1.16.3/contrib/pci_traffic/README 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/contrib/pci_traffic/README 2019-03-28 20:36:33.000000000 +0100
@@ -87,4 +87,4 @@
device.
I hope this may be useful for you.
-Mauro Carvalho Chehab <mchehab@infradead.org>
+Mauro Carvalho Chehab <mchehab@kernel.org>
diff -Nru v4l-utils-1.16.3/contrib/test/driver-test.c v4l-utils-1.16.5/contrib/test/driver-test.c
--- v4l-utils-1.16.3/contrib/test/driver-test.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/contrib/test/driver-test.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,7 +1,7 @@
/*
driver-test.c - This program tests V4L2 kernel drivers
- Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@kernel.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -Nru v4l-utils-1.16.3/contrib/test/mc_nextgen_test.c v4l-utils-1.16.5/contrib/test/mc_nextgen_test.c
--- v4l-utils-1.16.3/contrib/test/mc_nextgen_test.c 2018-08-17 19:44:28.000000000 +0200
+++ v4l-utils-1.16.5/contrib/test/mc_nextgen_test.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,7 +1,7 @@
/*
* Media controller Next Generation test app
*
- * Copyright (C) 2015 Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+ * Copyright (C) 2015 Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@
#define PROGRAM_NAME "mc_nextgen_test"
const char *argp_program_version = PROGRAM_NAME " version " V4L_UTILS_VERSION;
-const char *argp_program_bug_address = "Mauro Carvalho Chehab <m.chehab@samsung.com>";
+const char *argp_program_bug_address = "Mauro Carvalho Chehab <mchehab@kernel.org>";
static const char doc[] = "\nA testing tool for the MC next geneneration API\n";
diff -Nru v4l-utils-1.16.3/contrib/test/v4l2gl.c v4l-utils-1.16.5/contrib/test/v4l2gl.c
--- v4l-utils-1.16.3/contrib/test/v4l2gl.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/contrib/test/v4l2gl.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/* V4L2 video picture grabber and GL displayer
- Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@kernel.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -266,7 +266,7 @@
*/
const char *argp_program_version = "V4L2 grabber version " V4L_UTILS_VERSION;
-const char *argp_program_bug_address = "Mauro Carvalho Chehab <m.chehab@samsung.com>";
+const char *argp_program_bug_address = "Mauro Carvalho Chehab <mchehab@kernel.org>";
static const char doc[] = "\nCapture images using libv4l, storing them as ppm files\n";
diff -Nru v4l-utils-1.16.3/contrib/test/v4l2grab.c v4l-utils-1.16.5/contrib/test/v4l2grab.c
--- v4l-utils-1.16.3/contrib/test/v4l2grab.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/contrib/test/v4l2grab.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/* V4L2 video picture grabber
- Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@kernel.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -327,7 +327,7 @@
*/
const char *argp_program_version = "V4L2 grabber version " V4L_UTILS_VERSION;
-const char *argp_program_bug_address = "Mauro Carvalho Chehab <m.chehab@samsung.com>";
+const char *argp_program_bug_address = "Mauro Carvalho Chehab <mchehab@kernel.org>";
static const char doc[] = "\nCapture images using libv4l, storing them as ppm files\n";
diff -Nru v4l-utils-1.16.3/contrib/xc3028-firmware/firmware-tool.c v4l-utils-1.16.5/contrib/xc3028-firmware/firmware-tool.c
--- v4l-utils-1.16.3/contrib/xc3028-firmware/firmware-tool.c 2017-12-27 14:50:55.000000000 +0100
+++ v4l-utils-1.16.5/contrib/xc3028-firmware/firmware-tool.c 2019-03-28 20:36:33.000000000 +0100
@@ -3,7 +3,7 @@
Copyright (C) 2007 Michel Ludwig <michel.ludwig@gmail.com>
- Copyright (C) 2007, 2008 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2007, 2008 Mauro Carvalho Chehab <mchehab@kernel.org>
- Improve --list command
- Add --seek command
diff -Nru v4l-utils-1.16.3/debian/changelog v4l-utils-1.16.5/debian/changelog
--- v4l-utils-1.16.3/debian/changelog 2018-12-15 19:34:33.000000000 +0100
+++ v4l-utils-1.16.5/debian/changelog 2019-03-28 20:55:44.000000000 +0100
@@ -1,3 +1,9 @@
+v4l-utils (1.16.5-1) unstable; urgency=medium
+
+ * Imported Upstream version 1.16.5
+
+ -- Gregor Jasny <gjasny@googlemail.com> Thu, 28 Mar 2019 20:55:44 +0100
+
v4l-utils (1.16.3-1) unstable; urgency=medium
* Imported Upstream version 1.16.3
diff -Nru v4l-utils-1.16.3/debian/control v4l-utils-1.16.5/debian/control
--- v4l-utils-1.16.3/debian/control 2018-12-15 19:33:01.000000000 +0100
+++ v4l-utils-1.16.5/debian/control 2019-03-28 20:49:57.000000000 +0100
@@ -2,8 +2,7 @@
Section: video
Priority: optional
Maintainer: Gregor Jasny <gjasny@googlemail.com>
-Uploaders: Martin Pitt <mpitt@debian.org>,
- Loic Minier <lool@dooz.org>
+Uploaders: Loic Minier <lool@dooz.org>
Build-Depends: debhelper (>= 8.1.3),
dh-autoreconf,
autotools-dev,
diff -Nru v4l-utils-1.16.3/doc/libdvbv5-index.doc v4l-utils-1.16.5/doc/libdvbv5-index.doc
--- v4l-utils-1.16.3/doc/libdvbv5-index.doc 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/doc/libdvbv5-index.doc 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2014 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -21,7 +21,7 @@
/**
@mainpage The libdvbv5 API documentation
@copyright GNU General Public License version 2 (GPLv2)
-@author Mauro Carvalho Chehab <m.chehab@samsung.com>
+@author Mauro Carvalho Chehab <mchehab@kernel.org>
@par Source code
The source code for libdvbv5 is available together with v4l-utils source
code, at: http://git.linuxtv.org/cgit.cgi/v4l-utils.git/
diff -Nru v4l-utils-1.16.3/lib/include/libdvbv5/desc_atsc_service_location.h v4l-utils-1.16.5/lib/include/libdvbv5/desc_atsc_service_location.h
--- v4l-utils-1.16.3/lib/include/libdvbv5/desc_atsc_service_location.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/include/libdvbv5/desc_atsc_service_location.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013-2014 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/include/libdvbv5/desc_extension.h v4l-utils-1.16.5/lib/include/libdvbv5/desc_extension.h
--- v4l-utils-1.16.3/lib/include/libdvbv5/desc_extension.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/include/libdvbv5/desc_extension.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013-2014 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/include/libdvbv5/desc_isdbt_delivery.h v4l-utils-1.16.5/lib/include/libdvbv5/desc_isdbt_delivery.h
--- v4l-utils-1.16.3/lib/include/libdvbv5/desc_isdbt_delivery.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/include/libdvbv5/desc_isdbt_delivery.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013-2014 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/include/libdvbv5/desc_logical_channel.h v4l-utils-1.16.5/lib/include/libdvbv5/desc_logical_channel.h
--- v4l-utils-1.16.3/lib/include/libdvbv5/desc_logical_channel.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/include/libdvbv5/desc_logical_channel.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/include/libdvbv5/desc_partial_reception.h v4l-utils-1.16.5/lib/include/libdvbv5/desc_partial_reception.h
--- v4l-utils-1.16.3/lib/include/libdvbv5/desc_partial_reception.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/include/libdvbv5/desc_partial_reception.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/include/libdvbv5/desc_t2_delivery.h v4l-utils-1.16.5/lib/include/libdvbv5/desc_t2_delivery.h
--- v4l-utils-1.16.3/lib/include/libdvbv5/desc_t2_delivery.h 2017-12-27 14:50:55.000000000 +0100
+++ v4l-utils-1.16.5/lib/include/libdvbv5/desc_t2_delivery.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013-2014 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/include/libdvbv5/desc_ts_info.h v4l-utils-1.16.5/lib/include/libdvbv5/desc_ts_info.h
--- v4l-utils-1.16.3/lib/include/libdvbv5/desc_ts_info.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/include/libdvbv5/desc_ts_info.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013-2014 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/include/libdvbv5/libdvb-version.h v4l-utils-1.16.5/lib/include/libdvbv5/libdvb-version.h
--- v4l-utils-1.16.3/lib/include/libdvbv5/libdvb-version.h 2018-12-15 19:17:21.000000000 +0100
+++ v4l-utils-1.16.5/lib/include/libdvbv5/libdvb-version.h 2019-03-28 20:40:13.000000000 +0100
@@ -1,4 +1,4 @@
#define LIBDVBV5_VERSION_MAJOR 1
#define LIBDVBV5_VERSION_MINOR 16
-#define LIBDVBV5_VERSION_PATCH 3
-#define LIBDVBV5_VERSION "1.16.3"
+#define LIBDVBV5_VERSION_PATCH 5
+#define LIBDVBV5_VERSION "1.16.5"
diff -Nru v4l-utils-1.16.3/lib/include/libdvbv5/vct.h v4l-utils-1.16.5/lib/include/libdvbv5/vct.h
--- v4l-utils-1.16.3/lib/include/libdvbv5/vct.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/include/libdvbv5/vct.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013 - Mauro Carvalho Chehab <mchehab@kernel.org>
* Copyright (c) 2013 - Andre Roth <neolynx@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
diff -Nru v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_atsc_service_location.c v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_atsc_service_location.c
--- v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_atsc_service_location.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_atsc_service_location.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_extension.c v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_extension.c
--- v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_extension.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_extension.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_isdbt_delivery.c v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_isdbt_delivery.c
--- v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_isdbt_delivery.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_isdbt_delivery.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_logical_channel.c v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_logical_channel.c
--- v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_logical_channel.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_logical_channel.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_partial_reception.c v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_partial_reception.c
--- v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_partial_reception.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_partial_reception.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_t2_delivery.c v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_t2_delivery.c
--- v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_t2_delivery.c 2017-12-27 14:50:55.000000000 +0100
+++ v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_t2_delivery.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_ts_info.c v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_ts_info.c
--- v4l-utils-1.16.3/lib/libdvbv5/descriptors/desc_ts_info.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/libdvbv5/descriptors/desc_ts_info.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013 - Mauro Carvalho Chehab <mchehab@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff -Nru v4l-utils-1.16.3/lib/libdvbv5/dvb-dev-local.c v4l-utils-1.16.5/lib/libdvbv5/dvb-dev-local.c
--- v4l-utils-1.16.3/lib/libdvbv5/dvb-dev-local.c 2018-08-17 19:44:28.000000000 +0200
+++ v4l-utils-1.16.5/lib/libdvbv5/dvb-dev-local.c 2019-03-21 20:57:09.000000000 +0100
@@ -467,7 +467,7 @@
flags &= ~O_NONBLOCK;
}
- ret = dvb_fe_open_fname(parms, strdup(dev->path), flags);
+ ret = dvb_fe_open_fname(parms, dev->path, flags);
if (ret) {
free(open_dev);
return NULL;
diff -Nru v4l-utils-1.16.3/lib/libdvbv5/dvb-fe.c v4l-utils-1.16.5/lib/libdvbv5/dvb-fe.c
--- v4l-utils-1.16.3/lib/libdvbv5/dvb-fe.c 2018-08-17 19:44:28.000000000 +0200
+++ v4l-utils-1.16.5/lib/libdvbv5/dvb-fe.c 2019-03-28 20:36:27.000000000 +0100
@@ -133,7 +133,6 @@
int flags)
{
int ret;
- char *fname;
struct dvb_device *dvb;
struct dvb_dev_list *dvb_dev;
struct dvb_v5_fe_parms_priv *parms = NULL;
@@ -153,7 +152,6 @@
dvb_dev_free(dvb);
return NULL;
}
- fname = strdup(dvb_dev->path);
if (!strcmp(dvb_dev->bus_addr, "platform:dvbloopback")) {
logfunc(LOG_WARNING, _("Detected dvbloopback"));
@@ -161,14 +159,10 @@
}
dvb_dev_free(dvb);
- if (!fname) {
- logfunc(LOG_ERR, _("fname calloc: %s"), strerror(errno));
- return NULL;
- }
+
parms = calloc(sizeof(*parms), 1);
if (!parms) {
logfunc(LOG_ERR, _("parms calloc: %s"), strerror(errno));
- free(fname);
return NULL;
}
parms->p.verbose = verbose;
@@ -183,7 +177,7 @@
if (use_legacy_call)
parms->p.legacy_fe = 1;
- ret = dvb_fe_open_fname(parms, fname, flags);
+ ret = dvb_fe_open_fname(parms, dvb_dev->path, flags);
if (ret < 0) {
free(parms);
return NULL;
@@ -203,7 +197,6 @@
fd = open(fname, flags, 0);
if (fd == -1) {
dvb_logerr(_("%s while opening %s"), strerror(errno), fname);
- free(fname);
return -errno;
}
@@ -226,7 +219,12 @@
}
}
- parms->fname = fname;
+ parms->fname = strdup(fname);
+ if (!parms->fname) {
+ dvb_logerr(_("fname calloc: %s"), strerror(errno));
+ return -errno;
+ }
+
parms->fd = fd;
parms->fe_flags = flags;
parms->dvb_prop[0].cmd = DTV_API_VERSION;
diff -Nru v4l-utils-1.16.3/lib/libdvbv5/dvb-sat.c v4l-utils-1.16.5/lib/libdvbv5/dvb-sat.c
--- v4l-utils-1.16.3/lib/libdvbv5/dvb-sat.c 2017-12-27 14:51:17.000000000 +0100
+++ v4l-utils-1.16.5/lib/libdvbv5/dvb-sat.c 2019-03-28 20:36:33.000000000 +0100
@@ -53,7 +53,24 @@
static const struct dvb_sat_lnb_priv lnb_array[] = {
{
.desc = {
- .name = N_("Universal, Europe"),
+ .name = N_("Astra 19.2E, European Universal Ku (extended)"),
+ .alias = "EXTENDED",
+ // Legacy fields - kept just to avoid API/ABI breakages
+ .lowfreq = 9750,
+ .highfreq = 10600,
+ .rangeswitch = 11700,
+ .freqrange = {
+ { 10700, 11700 },
+ { 11700, 12750 },
+ },
+ },
+ .freqrange = {
+ { 10700, 11700, 9750, 11700},
+ { 11700, 12750, 10600, 0 },
+ }
+ }, {
+ .desc = {
+ .name = N_("Old European Universal. Nowadays mostly replaced by Astra 19.2E"),
.alias = "UNIVERSAL",
// Legacy fields - kept just to avoid API/ABI breakages
.lowfreq = 9750,
@@ -83,23 +100,6 @@
}
}, {
.desc = {
- .name = N_("Astra 1E, European Universal Ku (extended)"),
- .alias = "EXTENDED",
- // Legacy fields - kept just to avoid API/ABI breakages
- .lowfreq = 9750,
- .highfreq = 10600,
- .rangeswitch = 11700,
- .freqrange = {
- { 10700, 11700 },
- { 11700, 12750 },
- },
- },
- .freqrange = {
- { 10700, 11700, 9750, 11700},
- { 11700, 12750, 10600, 0 },
- }
- }, {
- .desc = {
.name = N_("Standard"),
.alias = "STANDARD",
// Legacy fields - kept just to avoid API/ABI breakages
diff -Nru v4l-utils-1.16.3/lib/libdvbv5/tables/vct.c v4l-utils-1.16.5/lib/libdvbv5/tables/vct.c
--- v4l-utils-1.16.3/lib/libdvbv5/tables/vct.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/libdvbv5/tables/vct.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 - Mauro Carvalho Chehab <m.chehab@samsung.com>
+ * Copyright (c) 2013 - Mauro Carvalho Chehab <mchehab@kernel.org>
* Copyright (c) 2013-2014 - Andre Roth <neolynx@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
diff -Nru v4l-utils-1.16.3/lib/libv4l1/libv4l1-kernelcode-license.txt v4l-utils-1.16.5/lib/libv4l1/libv4l1-kernelcode-license.txt
--- v4l-utils-1.16.3/lib/libv4l1/libv4l1-kernelcode-license.txt 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/lib/libv4l1/libv4l1-kernelcode-license.txt 2019-03-28 20:36:33.000000000 +0100
@@ -326,7 +326,7 @@
Wed, 19 May 2010 10:25:00 -0400
Message-ID: <4BF3F4B9.3060803@redhat.com>
Date: Wed, 19 May 2010 11:24:57 -0300
-From: Mauro Carvalho Chehab <mchehab@redhat.com>
+From: Mauro Carvalho Chehab <mchehab@kernel.org>
User-Agent: Thunderbird 2.0.0.22 (X11/20090609)
MIME-Version: 1.0
To: Hans de Goede <hdegoede@redhat.com>
diff -Nru v4l-utils-1.16.3/libdvbv5-po/ca.po v4l-utils-1.16.5/libdvbv5-po/ca.po
--- v4l-utils-1.16.3/libdvbv5-po/ca.po 2018-12-15 19:17:28.000000000 +0100
+++ v4l-utils-1.16.5/libdvbv5-po/ca.po 2019-03-28 20:40:19.000000000 +0100
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: v4l-utils 1.8.1\n"
"Report-Msgid-Bugs-To: linux-media@vger.Kernel.org\n"
-"POT-Creation-Date: 2018-12-15 19:17+0100\n"
+"POT-Creation-Date: 2019-03-28 20:40+0100\n"
"PO-Revision-Date: 2016-03-10 04:31+0000\n"
"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
"Language-Team: Catalan\n"
@@ -15,275 +15,275 @@
"X-Generator: Zanata 4.6.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: lib/libdvbv5/dvb-fe.c:151
+#: lib/libdvbv5/dvb-fe.c:150
#, c-format
msgid "adapter %d, frontend %d not found"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:159
+#: lib/libdvbv5/dvb-fe.c:157
msgid "Detected dvbloopback"
msgstr ""
#: lib/libdvbv5/dvb-fe.c:165
#, c-format
-msgid "fname calloc: %s"
-msgstr ""
-
-#: lib/libdvbv5/dvb-fe.c:170
-#, c-format
msgid "parms calloc: %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:205
+#: lib/libdvbv5/dvb-fe.c:199
#, c-format
msgid "%s while opening %s"
msgstr "%s mentre s'obria %s"
-#: lib/libdvbv5/dvb-fe.c:221
+#: lib/libdvbv5/dvb-fe.c:214
#, c-format
msgid "Device %s (%s) capabilities:"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:247
+#: lib/libdvbv5/dvb-fe.c:224
+#, c-format
+msgid "fname calloc: %s"
+msgstr ""
+
+#: lib/libdvbv5/dvb-fe.c:245
#, c-format
msgid "DVB API Version %d.%d%s, Current v5 delivery system: %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:250
+#: lib/libdvbv5/dvb-fe.c:248
msgid " (forcing DVBv3 calls)"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:295
+#: lib/libdvbv5/dvb-fe.c:293
msgid "delivery system not detected"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:316
+#: lib/libdvbv5/dvb-fe.c:314
msgid "driver returned 0 supported delivery systems!"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:324
+#: lib/libdvbv5/dvb-fe.c:322
msgid "Supported delivery system: "
msgid_plural "Supported delivery systems: "
msgstr[0] ""
msgstr[1] ""
-#: lib/libdvbv5/dvb-fe.c:334
+#: lib/libdvbv5/dvb-fe.c:332
msgid ""
"Warning: new delivery systems like ISDB-T, ISDB-S, DMB-TH, DSS, ATSC-MH will "
"be miss-detected by a DVBv5.4 or earlier API call"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:365
+#: lib/libdvbv5/dvb-fe.c:363
msgid "Frequency range for the current standard: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:368
+#: lib/libdvbv5/dvb-fe.c:366
#, c-format
msgid "From: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:370
+#: lib/libdvbv5/dvb-fe.c:368
#, c-format
msgid "To: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:373
+#: lib/libdvbv5/dvb-fe.c:371
#, c-format
msgid "Step: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:377
+#: lib/libdvbv5/dvb-fe.c:375
#, c-format
msgid "Tolerance: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:381
+#: lib/libdvbv5/dvb-fe.c:379
msgid "Symbol rate ranges for the current standard: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:383
+#: lib/libdvbv5/dvb-fe.c:381
#, c-format
msgid "From: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:385
+#: lib/libdvbv5/dvb-fe.c:383
#, c-format
msgid "To: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:388
+#: lib/libdvbv5/dvb-fe.c:386
#, c-format
msgid "Tolerance: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:518
+#: lib/libdvbv5/dvb-fe.c:516
msgid "Set delivery system"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:530
+#: lib/libdvbv5/dvb-fe.c:528
msgid "Can't retrieve DVB information for the new delivery system."
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:615
+#: lib/libdvbv5/dvb-fe.c:613
#, c-format
msgid "Using a DVBv3 compat file for %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:704
+#: lib/libdvbv5/dvb-fe.c:702
#, c-format
msgid "command %s (%d) not found during retrieve"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:721
+#: lib/libdvbv5/dvb-fe.c:719
#, c-format
msgid "command %s (%d) not found during store"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:783
+#: lib/libdvbv5/dvb-fe.c:781
#, c-format
msgid "Got parameters for %s:"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:902
+#: lib/libdvbv5/dvb-fe.c:900
msgid "Setting LNA"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:905
+#: lib/libdvbv5/dvb-fe.c:903
#, c-format
msgid "LNA is %s"
msgstr "LNA està %s"
-#: lib/libdvbv5/dvb-fe.c:905 lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:903 lib/libdvbv5/dvb-fe.c:1901
msgid "ON"
msgstr "ENGEGAT"
-#: lib/libdvbv5/dvb-fe.c:905 lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:903 lib/libdvbv5/dvb-fe.c:1901
msgid "OFF"
msgstr "APAGAT"
-#: lib/libdvbv5/dvb-fe.c:1005
+#: lib/libdvbv5/dvb-fe.c:1003
#, c-format
msgid "%s not found on store"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1077 lib/libdvbv5/dvb-fe.c:1092
+#: lib/libdvbv5/dvb-fe.c:1075 lib/libdvbv5/dvb-fe.c:1090
#, c-format
msgid "%s not found on retrieve"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1099
+#: lib/libdvbv5/dvb-fe.c:1097
#, c-format
msgid "%s not available"
msgstr "%s no està disponible"
-#: lib/libdvbv5/dvb-fe.c:1106
+#: lib/libdvbv5/dvb-fe.c:1104
#, c-format
msgid "Stats for %s = %d"
msgstr "Estadístiques per %s = %d"
-#: lib/libdvbv5/dvb-fe.c:1531 lib/libdvbv5/dvb-fe.c:1561
+#: lib/libdvbv5/dvb-fe.c:1529 lib/libdvbv5/dvb-fe.c:1559
msgid "Status: "
msgstr "Estat: "
-#: lib/libdvbv5/dvb-fe.c:1536
+#: lib/libdvbv5/dvb-fe.c:1534
#, c-format
msgid "BER: %d, Strength: %d, SNR: %d, UCB: %d"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1690
+#: lib/libdvbv5/dvb-fe.c:1688
msgid "RF"
msgstr "RF"
-#: lib/libdvbv5/dvb-fe.c:1691
+#: lib/libdvbv5/dvb-fe.c:1689
msgid "Carrier"
msgstr "Portadora"
-#: lib/libdvbv5/dvb-fe.c:1692
+#: lib/libdvbv5/dvb-fe.c:1690
msgid "Viterbi"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1693
+#: lib/libdvbv5/dvb-fe.c:1691
msgid "Sync"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1694
+#: lib/libdvbv5/dvb-fe.c:1692
msgid "Lock"
msgstr "Bloqueig"
-#: lib/libdvbv5/dvb-fe.c:1695
+#: lib/libdvbv5/dvb-fe.c:1693
msgid "Timeout"
msgstr "Temps d'expiració"
-#: lib/libdvbv5/dvb-fe.c:1696
+#: lib/libdvbv5/dvb-fe.c:1694
msgid "Reinit"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1700
+#: lib/libdvbv5/dvb-fe.c:1698
msgid "Poor"
msgstr "Pobra"
-#: lib/libdvbv5/dvb-fe.c:1701
+#: lib/libdvbv5/dvb-fe.c:1699
msgid "Ok"
msgstr "D'acord"
-#: lib/libdvbv5/dvb-fe.c:1702
+#: lib/libdvbv5/dvb-fe.c:1700
msgid "Good"
msgstr "Bona"
-#: lib/libdvbv5/dvb-fe.c:1725
+#: lib/libdvbv5/dvb-fe.c:1723
msgid "Error: no adapter status"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1737
+#: lib/libdvbv5/dvb-fe.c:1735
#, c-format
msgid "%-7s"
msgstr "%-7s"
-#: lib/libdvbv5/dvb-fe.c:1744
+#: lib/libdvbv5/dvb-fe.c:1742
#, c-format
msgid "%7s"
msgstr "%7s"
-#: lib/libdvbv5/dvb-fe.c:1789
+#: lib/libdvbv5/dvb-fe.c:1787
#, c-format
msgid " Layer %c:"
msgstr " Capa %c:"
-#: lib/libdvbv5/dvb-fe.c:1864
+#: lib/libdvbv5/dvb-fe.c:1862
msgid "SEC: set voltage to OFF"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1868
+#: lib/libdvbv5/dvb-fe.c:1866
#, c-format
msgid "SEC: set voltage to %sV"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1887
+#: lib/libdvbv5/dvb-fe.c:1885
#, c-format
msgid "DiSEqC TONE: %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:1901
#, c-format
msgid "DiSEqC HIGH LNB VOLTAGE: %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1921
+#: lib/libdvbv5/dvb-fe.c:1919
#, c-format
msgid "DiSEqC BURST: %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1947
+#: lib/libdvbv5/dvb-fe.c:1945
#, c-format
msgid "DiSEqC command: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1997
+#: lib/libdvbv5/dvb-fe.c:1995
#, c-format
msgid "Assuming you're in %s.\n"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:2000
+#: lib/libdvbv5/dvb-fe.c:1998
msgid "Failed to guess country from the current locale setting.\n"
msgstr ""
@@ -524,15 +524,15 @@
msgstr "DEPURACIÓ "
#: lib/libdvbv5/dvb-sat.c:56
-msgid "Universal, Europe"
+msgid "Astra 19.2E, European Universal Ku (extended)"
msgstr ""
#: lib/libdvbv5/dvb-sat.c:73
-msgid "Expressvu, North America"
+msgid "Old European Universal. Nowadays mostly replaced by Astra 19.2E"
msgstr ""
-#: lib/libdvbv5/dvb-sat.c:86
-msgid "Astra 1E, European Universal Ku (extended)"
+#: lib/libdvbv5/dvb-sat.c:90
+msgid "Expressvu, North America"
msgstr ""
#: lib/libdvbv5/dvb-sat.c:103
Binary files /tmp/mA9XpP6KsI/v4l-utils-1.16.3/libdvbv5-po/de.gmo and /tmp/qyf9LRyszZ/v4l-utils-1.16.5/libdvbv5-po/de.gmo differ
diff -Nru v4l-utils-1.16.3/libdvbv5-po/de.po v4l-utils-1.16.5/libdvbv5-po/de.po
--- v4l-utils-1.16.3/libdvbv5-po/de.po 2018-12-15 19:17:28.000000000 +0100
+++ v4l-utils-1.16.5/libdvbv5-po/de.po 2019-03-28 20:40:19.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: v4l-utils 1.12.3\n"
"Report-Msgid-Bugs-To: linux-media@vger.Kernel.org\n"
-"POT-Creation-Date: 2018-12-15 19:17+0100\n"
+"POT-Creation-Date: 2019-03-28 20:40+0100\n"
"PO-Revision-Date: 2017-05-06 22:58+0200\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -17,59 +17,59 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: lib/libdvbv5/dvb-fe.c:151
+#: lib/libdvbv5/dvb-fe.c:150
#, c-format
msgid "adapter %d, frontend %d not found"
msgstr "Adapter %d, Oberfläche %d nicht gefunden"
-#: lib/libdvbv5/dvb-fe.c:159
+#: lib/libdvbv5/dvb-fe.c:157
msgid "Detected dvbloopback"
msgstr ""
#: lib/libdvbv5/dvb-fe.c:165
#, c-format
-msgid "fname calloc: %s"
-msgstr "fname calloc: %s"
-
-#: lib/libdvbv5/dvb-fe.c:170
-#, c-format
msgid "parms calloc: %s"
msgstr "parms calloc: %s"
-#: lib/libdvbv5/dvb-fe.c:205
+#: lib/libdvbv5/dvb-fe.c:199
#, c-format
msgid "%s while opening %s"
msgstr "%s beim Öffnen von %s"
-#: lib/libdvbv5/dvb-fe.c:221
+#: lib/libdvbv5/dvb-fe.c:214
#, c-format
msgid "Device %s (%s) capabilities:"
msgstr "Gerät %s (%s) Fähigkeiten:"
-#: lib/libdvbv5/dvb-fe.c:247
+#: lib/libdvbv5/dvb-fe.c:224
+#, c-format
+msgid "fname calloc: %s"
+msgstr "fname calloc: %s"
+
+#: lib/libdvbv5/dvb-fe.c:245
#, c-format
msgid "DVB API Version %d.%d%s, Current v5 delivery system: %s"
msgstr "DVB-API-Version %d.%d%s, derzeitiges V5-Liefersystem: %s"
-#: lib/libdvbv5/dvb-fe.c:250
+#: lib/libdvbv5/dvb-fe.c:248
msgid " (forcing DVBv3 calls)"
msgstr " (DVBv3-Aufrufe werden erzwungen)"
-#: lib/libdvbv5/dvb-fe.c:295
+#: lib/libdvbv5/dvb-fe.c:293
msgid "delivery system not detected"
msgstr "Übertragungssystem nicht entdeckt"
-#: lib/libdvbv5/dvb-fe.c:316
+#: lib/libdvbv5/dvb-fe.c:314
msgid "driver returned 0 supported delivery systems!"
msgstr "Treiber gab 0 unterstützte Übertragungssysteme zurück!"
-#: lib/libdvbv5/dvb-fe.c:324
+#: lib/libdvbv5/dvb-fe.c:322
msgid "Supported delivery system: "
msgid_plural "Supported delivery systems: "
msgstr[0] "unterstütztes Übertragungssystem: "
msgstr[1] "unterstützte Übertragungssysteme: "
-#: lib/libdvbv5/dvb-fe.c:334
+#: lib/libdvbv5/dvb-fe.c:332
msgid ""
"Warning: new delivery systems like ISDB-T, ISDB-S, DMB-TH, DSS, ATSC-MH will "
"be miss-detected by a DVBv5.4 or earlier API call"
@@ -77,218 +77,218 @@
"Warnung: Neue Übertragungssysteme wie ISDB-T, ISDB-S, DMB-TH, DSS oder ATSC-"
"MH werden falsch durch einen Aufruf von DVBv5.4 oder älter erkannt."
-#: lib/libdvbv5/dvb-fe.c:365
+#: lib/libdvbv5/dvb-fe.c:363
msgid "Frequency range for the current standard: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:368
+#: lib/libdvbv5/dvb-fe.c:366
#, c-format
msgid "From: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:370
+#: lib/libdvbv5/dvb-fe.c:368
#, c-format
msgid "To: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:373
+#: lib/libdvbv5/dvb-fe.c:371
#, c-format
msgid "Step: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:377
+#: lib/libdvbv5/dvb-fe.c:375
#, c-format
msgid "Tolerance: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:381
+#: lib/libdvbv5/dvb-fe.c:379
msgid "Symbol rate ranges for the current standard: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:383
+#: lib/libdvbv5/dvb-fe.c:381
#, c-format
msgid "From: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:385
+#: lib/libdvbv5/dvb-fe.c:383
#, c-format
msgid "To: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:388
+#: lib/libdvbv5/dvb-fe.c:386
#, c-format
msgid "Tolerance: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:518
+#: lib/libdvbv5/dvb-fe.c:516
msgid "Set delivery system"
msgstr "setzt das Übertragungssystem"
-#: lib/libdvbv5/dvb-fe.c:530
+#: lib/libdvbv5/dvb-fe.c:528
msgid "Can't retrieve DVB information for the new delivery system."
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:615
+#: lib/libdvbv5/dvb-fe.c:613
#, c-format
msgid "Using a DVBv3 compat file for %s"
msgstr "verwendet DVBv3-kompatible Datei für %s"
-#: lib/libdvbv5/dvb-fe.c:704
+#: lib/libdvbv5/dvb-fe.c:702
#, c-format
msgid "command %s (%d) not found during retrieve"
msgstr "Befehl %s (%d) während der Abfrage nicht gefunden"
-#: lib/libdvbv5/dvb-fe.c:721
+#: lib/libdvbv5/dvb-fe.c:719
#, c-format
msgid "command %s (%d) not found during store"
msgstr "Befehl %s (%d) während des Speicherns nicht gefunden"
-#: lib/libdvbv5/dvb-fe.c:783
+#: lib/libdvbv5/dvb-fe.c:781
#, c-format
msgid "Got parameters for %s:"
msgstr "Parameter für %s bekommen:"
-#: lib/libdvbv5/dvb-fe.c:902
+#: lib/libdvbv5/dvb-fe.c:900
msgid "Setting LNA"
msgstr "LNA wird gesetzt"
-#: lib/libdvbv5/dvb-fe.c:905
+#: lib/libdvbv5/dvb-fe.c:903
#, c-format
msgid "LNA is %s"
msgstr "LNA ist %s"
-#: lib/libdvbv5/dvb-fe.c:905 lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:903 lib/libdvbv5/dvb-fe.c:1901
msgid "ON"
msgstr "AN"
-#: lib/libdvbv5/dvb-fe.c:905 lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:903 lib/libdvbv5/dvb-fe.c:1901
msgid "OFF"
msgstr "AUS"
-#: lib/libdvbv5/dvb-fe.c:1005
+#: lib/libdvbv5/dvb-fe.c:1003
#, c-format
msgid "%s not found on store"
msgstr "%s nicht beim Speichern gefunden"
-#: lib/libdvbv5/dvb-fe.c:1077 lib/libdvbv5/dvb-fe.c:1092
+#: lib/libdvbv5/dvb-fe.c:1075 lib/libdvbv5/dvb-fe.c:1090
#, c-format
msgid "%s not found on retrieve"
msgstr "%s nicht beim Abfragen gefunden"
-#: lib/libdvbv5/dvb-fe.c:1099
+#: lib/libdvbv5/dvb-fe.c:1097
#, c-format
msgid "%s not available"
msgstr "%s nicht verfügbar"
-#: lib/libdvbv5/dvb-fe.c:1106
+#: lib/libdvbv5/dvb-fe.c:1104
#, c-format
msgid "Stats for %s = %d"
msgstr "Statistiken für %s = %d"
-#: lib/libdvbv5/dvb-fe.c:1531 lib/libdvbv5/dvb-fe.c:1561
+#: lib/libdvbv5/dvb-fe.c:1529 lib/libdvbv5/dvb-fe.c:1559
msgid "Status: "
msgstr "Status: "
-#: lib/libdvbv5/dvb-fe.c:1536
+#: lib/libdvbv5/dvb-fe.c:1534
#, c-format
msgid "BER: %d, Strength: %d, SNR: %d, UCB: %d"
msgstr "BER: %d, Stärke: %d, SNR: %d, UCB: %d"
-#: lib/libdvbv5/dvb-fe.c:1690
+#: lib/libdvbv5/dvb-fe.c:1688
msgid "RF"
msgstr "RF"
-#: lib/libdvbv5/dvb-fe.c:1691
+#: lib/libdvbv5/dvb-fe.c:1689
msgid "Carrier"
msgstr "Träger"
-#: lib/libdvbv5/dvb-fe.c:1692
+#: lib/libdvbv5/dvb-fe.c:1690
msgid "Viterbi"
msgstr "Viterbi"
-#: lib/libdvbv5/dvb-fe.c:1693
+#: lib/libdvbv5/dvb-fe.c:1691
msgid "Sync"
msgstr "Synchronisation"
-#: lib/libdvbv5/dvb-fe.c:1694
+#: lib/libdvbv5/dvb-fe.c:1692
msgid "Lock"
msgstr "Sperre"
-#: lib/libdvbv5/dvb-fe.c:1695
+#: lib/libdvbv5/dvb-fe.c:1693
msgid "Timeout"
msgstr "Zeitüberschreitung"
-#: lib/libdvbv5/dvb-fe.c:1696
+#: lib/libdvbv5/dvb-fe.c:1694
msgid "Reinit"
msgstr "Neuinitialisierung"
-#: lib/libdvbv5/dvb-fe.c:1700
+#: lib/libdvbv5/dvb-fe.c:1698
msgid "Poor"
msgstr "schwach"
-#: lib/libdvbv5/dvb-fe.c:1701
+#: lib/libdvbv5/dvb-fe.c:1699
msgid "Ok"
msgstr "Ok"
-#: lib/libdvbv5/dvb-fe.c:1702
+#: lib/libdvbv5/dvb-fe.c:1700
msgid "Good"
msgstr "gut"
-#: lib/libdvbv5/dvb-fe.c:1725
+#: lib/libdvbv5/dvb-fe.c:1723
msgid "Error: no adapter status"
msgstr "Fehler: kein Adapterstatus"
-#: lib/libdvbv5/dvb-fe.c:1737
+#: lib/libdvbv5/dvb-fe.c:1735
#, c-format
msgid "%-7s"
msgstr "%-7s"
-#: lib/libdvbv5/dvb-fe.c:1744
+#: lib/libdvbv5/dvb-fe.c:1742
#, c-format
msgid "%7s"
msgstr "%7s"
-#: lib/libdvbv5/dvb-fe.c:1789
+#: lib/libdvbv5/dvb-fe.c:1787
#, c-format
msgid " Layer %c:"
msgstr " Stufe %c:"
-#: lib/libdvbv5/dvb-fe.c:1864
+#: lib/libdvbv5/dvb-fe.c:1862
msgid "SEC: set voltage to OFF"
msgstr "SEC: setzt Spannung auf AUS"
-#: lib/libdvbv5/dvb-fe.c:1868
+#: lib/libdvbv5/dvb-fe.c:1866
#, c-format
msgid "SEC: set voltage to %sV"
msgstr "SEC: setzt Spannung auf %sV"
-#: lib/libdvbv5/dvb-fe.c:1887
+#: lib/libdvbv5/dvb-fe.c:1885
#, c-format
msgid "DiSEqC TONE: %s"
msgstr "DiSEqC-KLANG: %s"
-#: lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:1901
#, c-format
msgid "DiSEqC HIGH LNB VOLTAGE: %s"
msgstr "HOHE DiSEqC-LNB-SPANNUNG: %s"
# https://de.wikipedia.org/wiki/Phase_Alternating_Line
-#: lib/libdvbv5/dvb-fe.c:1921
+#: lib/libdvbv5/dvb-fe.c:1919
#, c-format
msgid "DiSEqC BURST: %s"
msgstr "DiSEqC-BURST: %s"
-#: lib/libdvbv5/dvb-fe.c:1947
+#: lib/libdvbv5/dvb-fe.c:1945
#, c-format
msgid "DiSEqC command: "
msgstr "DiSEqC-Befehl: "
-#: lib/libdvbv5/dvb-fe.c:1997
+#: lib/libdvbv5/dvb-fe.c:1995
#, c-format
msgid "Assuming you're in %s.\n"
msgstr "Angenommen, Sie sind in %s\n"
-#: lib/libdvbv5/dvb-fe.c:2000
+#: lib/libdvbv5/dvb-fe.c:1998
msgid "Failed to guess country from the current locale setting.\n"
msgstr "Raten des Landes aus der aktuellen Locale-Einstellung fehlgeschlagen\n"
@@ -532,17 +532,18 @@
msgstr "FEHL.SUCHE"
#: lib/libdvbv5/dvb-sat.c:56
-msgid "Universal, Europe"
-msgstr "universell, Europa"
+#, fuzzy
+msgid "Astra 19.2E, European Universal Ku (extended)"
+msgstr "Astra 1E, europäische universelles Ku (erweitert)"
#: lib/libdvbv5/dvb-sat.c:73
+msgid "Old European Universal. Nowadays mostly replaced by Astra 19.2E"
+msgstr ""
+
+#: lib/libdvbv5/dvb-sat.c:90
msgid "Expressvu, North America"
msgstr "Expressvu, Nordamerika"
-#: lib/libdvbv5/dvb-sat.c:86
-msgid "Astra 1E, European Universal Ku (extended)"
-msgstr "Astra 1E, europäische universelles Ku (erweitert)"
-
#: lib/libdvbv5/dvb-sat.c:103
msgid "Standard"
msgstr "Standard"
@@ -806,3 +807,6 @@
#, c-format
msgid "symbol rate not found"
msgstr "Symbolrate nicht gefunden"
+
+#~ msgid "Universal, Europe"
+#~ msgstr "universell, Europa"
diff -Nru v4l-utils-1.16.3/libdvbv5-po/libdvbv5.pot v4l-utils-1.16.5/libdvbv5-po/libdvbv5.pot
--- v4l-utils-1.16.3/libdvbv5-po/libdvbv5.pot 2018-12-15 19:17:28.000000000 +0100
+++ v4l-utils-1.16.5/libdvbv5-po/libdvbv5.pot 2019-03-28 20:40:19.000000000 +0100
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: v4l-utils 1.16.3\n"
+"Project-Id-Version: v4l-utils 1.16.5\n"
"Report-Msgid-Bugs-To: linux-media@vger.Kernel.org\n"
-"POT-Creation-Date: 2018-12-15 19:17+0100\n"
+"POT-Creation-Date: 2019-03-28 20:40+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"
@@ -18,275 +18,275 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: lib/libdvbv5/dvb-fe.c:151
+#: lib/libdvbv5/dvb-fe.c:150
#, c-format
msgid "adapter %d, frontend %d not found"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:159
+#: lib/libdvbv5/dvb-fe.c:157
msgid "Detected dvbloopback"
msgstr ""
#: lib/libdvbv5/dvb-fe.c:165
#, c-format
-msgid "fname calloc: %s"
-msgstr ""
-
-#: lib/libdvbv5/dvb-fe.c:170
-#, c-format
msgid "parms calloc: %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:205
+#: lib/libdvbv5/dvb-fe.c:199
#, c-format
msgid "%s while opening %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:221
+#: lib/libdvbv5/dvb-fe.c:214
#, c-format
msgid "Device %s (%s) capabilities:"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:247
+#: lib/libdvbv5/dvb-fe.c:224
+#, c-format
+msgid "fname calloc: %s"
+msgstr ""
+
+#: lib/libdvbv5/dvb-fe.c:245
#, c-format
msgid "DVB API Version %d.%d%s, Current v5 delivery system: %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:250
+#: lib/libdvbv5/dvb-fe.c:248
msgid " (forcing DVBv3 calls)"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:295
+#: lib/libdvbv5/dvb-fe.c:293
msgid "delivery system not detected"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:316
+#: lib/libdvbv5/dvb-fe.c:314
msgid "driver returned 0 supported delivery systems!"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:324
+#: lib/libdvbv5/dvb-fe.c:322
msgid "Supported delivery system: "
msgid_plural "Supported delivery systems: "
msgstr[0] ""
msgstr[1] ""
-#: lib/libdvbv5/dvb-fe.c:334
+#: lib/libdvbv5/dvb-fe.c:332
msgid ""
"Warning: new delivery systems like ISDB-T, ISDB-S, DMB-TH, DSS, ATSC-MH will "
"be miss-detected by a DVBv5.4 or earlier API call"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:365
+#: lib/libdvbv5/dvb-fe.c:363
msgid "Frequency range for the current standard: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:368
+#: lib/libdvbv5/dvb-fe.c:366
#, c-format
msgid "From: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:370
+#: lib/libdvbv5/dvb-fe.c:368
#, c-format
msgid "To: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:373
+#: lib/libdvbv5/dvb-fe.c:371
#, c-format
msgid "Step: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:377
+#: lib/libdvbv5/dvb-fe.c:375
#, c-format
msgid "Tolerance: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:381
+#: lib/libdvbv5/dvb-fe.c:379
msgid "Symbol rate ranges for the current standard: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:383
+#: lib/libdvbv5/dvb-fe.c:381
#, c-format
msgid "From: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:385
+#: lib/libdvbv5/dvb-fe.c:383
#, c-format
msgid "To: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:388
+#: lib/libdvbv5/dvb-fe.c:386
#, c-format
msgid "Tolerance: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:518
+#: lib/libdvbv5/dvb-fe.c:516
msgid "Set delivery system"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:530
+#: lib/libdvbv5/dvb-fe.c:528
msgid "Can't retrieve DVB information for the new delivery system."
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:615
+#: lib/libdvbv5/dvb-fe.c:613
#, c-format
msgid "Using a DVBv3 compat file for %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:704
+#: lib/libdvbv5/dvb-fe.c:702
#, c-format
msgid "command %s (%d) not found during retrieve"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:721
+#: lib/libdvbv5/dvb-fe.c:719
#, c-format
msgid "command %s (%d) not found during store"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:783
+#: lib/libdvbv5/dvb-fe.c:781
#, c-format
msgid "Got parameters for %s:"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:902
+#: lib/libdvbv5/dvb-fe.c:900
msgid "Setting LNA"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:905
+#: lib/libdvbv5/dvb-fe.c:903
#, c-format
msgid "LNA is %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:905 lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:903 lib/libdvbv5/dvb-fe.c:1901
msgid "ON"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:905 lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:903 lib/libdvbv5/dvb-fe.c:1901
msgid "OFF"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1005
+#: lib/libdvbv5/dvb-fe.c:1003
#, c-format
msgid "%s not found on store"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1077 lib/libdvbv5/dvb-fe.c:1092
+#: lib/libdvbv5/dvb-fe.c:1075 lib/libdvbv5/dvb-fe.c:1090
#, c-format
msgid "%s not found on retrieve"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1099
+#: lib/libdvbv5/dvb-fe.c:1097
#, c-format
msgid "%s not available"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1106
+#: lib/libdvbv5/dvb-fe.c:1104
#, c-format
msgid "Stats for %s = %d"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1531 lib/libdvbv5/dvb-fe.c:1561
+#: lib/libdvbv5/dvb-fe.c:1529 lib/libdvbv5/dvb-fe.c:1559
msgid "Status: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1536
+#: lib/libdvbv5/dvb-fe.c:1534
#, c-format
msgid "BER: %d, Strength: %d, SNR: %d, UCB: %d"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1690
+#: lib/libdvbv5/dvb-fe.c:1688
msgid "RF"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1691
+#: lib/libdvbv5/dvb-fe.c:1689
msgid "Carrier"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1692
+#: lib/libdvbv5/dvb-fe.c:1690
msgid "Viterbi"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1693
+#: lib/libdvbv5/dvb-fe.c:1691
msgid "Sync"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1694
+#: lib/libdvbv5/dvb-fe.c:1692
msgid "Lock"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1695
+#: lib/libdvbv5/dvb-fe.c:1693
msgid "Timeout"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1696
+#: lib/libdvbv5/dvb-fe.c:1694
msgid "Reinit"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1700
+#: lib/libdvbv5/dvb-fe.c:1698
msgid "Poor"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1701
+#: lib/libdvbv5/dvb-fe.c:1699
msgid "Ok"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1702
+#: lib/libdvbv5/dvb-fe.c:1700
msgid "Good"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1725
+#: lib/libdvbv5/dvb-fe.c:1723
msgid "Error: no adapter status"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1737
+#: lib/libdvbv5/dvb-fe.c:1735
#, c-format
msgid "%-7s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1744
+#: lib/libdvbv5/dvb-fe.c:1742
#, c-format
msgid "%7s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1789
+#: lib/libdvbv5/dvb-fe.c:1787
#, c-format
msgid " Layer %c:"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1864
+#: lib/libdvbv5/dvb-fe.c:1862
msgid "SEC: set voltage to OFF"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1868
+#: lib/libdvbv5/dvb-fe.c:1866
#, c-format
msgid "SEC: set voltage to %sV"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1887
+#: lib/libdvbv5/dvb-fe.c:1885
#, c-format
msgid "DiSEqC TONE: %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:1901
#, c-format
msgid "DiSEqC HIGH LNB VOLTAGE: %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1921
+#: lib/libdvbv5/dvb-fe.c:1919
#, c-format
msgid "DiSEqC BURST: %s"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1947
+#: lib/libdvbv5/dvb-fe.c:1945
#, c-format
msgid "DiSEqC command: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1997
+#: lib/libdvbv5/dvb-fe.c:1995
#, c-format
msgid "Assuming you're in %s.\n"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:2000
+#: lib/libdvbv5/dvb-fe.c:1998
msgid "Failed to guess country from the current locale setting.\n"
msgstr ""
@@ -527,15 +527,15 @@
msgstr ""
#: lib/libdvbv5/dvb-sat.c:56
-msgid "Universal, Europe"
+msgid "Astra 19.2E, European Universal Ku (extended)"
msgstr ""
#: lib/libdvbv5/dvb-sat.c:73
-msgid "Expressvu, North America"
+msgid "Old European Universal. Nowadays mostly replaced by Astra 19.2E"
msgstr ""
-#: lib/libdvbv5/dvb-sat.c:86
-msgid "Astra 1E, European Universal Ku (extended)"
+#: lib/libdvbv5/dvb-sat.c:90
+msgid "Expressvu, North America"
msgstr ""
#: lib/libdvbv5/dvb-sat.c:103
Binary files /tmp/mA9XpP6KsI/v4l-utils-1.16.3/libdvbv5-po/pt_BR.gmo and /tmp/qyf9LRyszZ/v4l-utils-1.16.5/libdvbv5-po/pt_BR.gmo differ
diff -Nru v4l-utils-1.16.3/libdvbv5-po/pt_BR.po v4l-utils-1.16.5/libdvbv5-po/pt_BR.po
--- v4l-utils-1.16.3/libdvbv5-po/pt_BR.po 2018-12-15 19:17:28.000000000 +0100
+++ v4l-utils-1.16.5/libdvbv5-po/pt_BR.po 2019-03-28 20:40:19.000000000 +0100
@@ -2,15 +2,15 @@
# Traduções em português brasileiro para libdvbv5.
# Copyright (C) 2014 Mauro Carvalho Chehab
# This file is distributed under the same license as the v4l-utils package.
-# Mauro Carvalho Chehab <mchehab@osg.samsung.com>, 2014.
+# Mauro Carvalho Chehab <mchehab@kernel.org>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: libdvbv5 1.7.0\n"
"Report-Msgid-Bugs-To: linux-media@vger.Kernel.org\n"
-"POT-Creation-Date: 2018-12-15 19:17+0100\n"
+"POT-Creation-Date: 2019-03-28 20:40+0100\n"
"PO-Revision-Date: 2017-05-06 23:13-0300\n"
-"Last-Translator: Mauro Carvalho Chehab <mchehab@osg.samsung.com>\n"
+"Last-Translator: Mauro Carvalho Chehab <mchehab@kernel.org>\n"
"Language-Team: Brazilian Portuguese\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
@@ -23,59 +23,59 @@
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-SearchPath-0: lib/libdvbv5\n"
-#: lib/libdvbv5/dvb-fe.c:151
+#: lib/libdvbv5/dvb-fe.c:150
#, c-format
msgid "adapter %d, frontend %d not found"
msgstr "adaptador %d, frontend %d não encontrado"
-#: lib/libdvbv5/dvb-fe.c:159
+#: lib/libdvbv5/dvb-fe.c:157
msgid "Detected dvbloopback"
msgstr ""
#: lib/libdvbv5/dvb-fe.c:165
#, c-format
-msgid "fname calloc: %s"
-msgstr "fname calloc: %s"
-
-#: lib/libdvbv5/dvb-fe.c:170
-#, c-format
msgid "parms calloc: %s"
msgstr "parms calloc: %s"
-#: lib/libdvbv5/dvb-fe.c:205
+#: lib/libdvbv5/dvb-fe.c:199
#, c-format
msgid "%s while opening %s"
msgstr "%s enquanto abrindo %s"
-#: lib/libdvbv5/dvb-fe.c:221
+#: lib/libdvbv5/dvb-fe.c:214
#, c-format
msgid "Device %s (%s) capabilities:"
msgstr "Dispositivo %s (%s) propriedades:"
-#: lib/libdvbv5/dvb-fe.c:247
+#: lib/libdvbv5/dvb-fe.c:224
+#, c-format
+msgid "fname calloc: %s"
+msgstr "fname calloc: %s"
+
+#: lib/libdvbv5/dvb-fe.c:245
#, c-format
msgid "DVB API Version %d.%d%s, Current v5 delivery system: %s"
msgstr "DVB API Versão %d.%d%s, sistema de TV digital atual (v5): %s"
-#: lib/libdvbv5/dvb-fe.c:250
+#: lib/libdvbv5/dvb-fe.c:248
msgid " (forcing DVBv3 calls)"
msgstr " (forçando chamadas via DVBv3)"
-#: lib/libdvbv5/dvb-fe.c:295
+#: lib/libdvbv5/dvb-fe.c:293
msgid "delivery system not detected"
msgstr "sistema de TV digital não detetado"
-#: lib/libdvbv5/dvb-fe.c:316
+#: lib/libdvbv5/dvb-fe.c:314
msgid "driver returned 0 supported delivery systems!"
msgstr "driver retornou 0 sistemas de TV digital suportados!"
-#: lib/libdvbv5/dvb-fe.c:324
+#: lib/libdvbv5/dvb-fe.c:322
msgid "Supported delivery system: "
msgid_plural "Supported delivery systems: "
msgstr[0] "Sistema de TV digital suportado:"
msgstr[1] "Sistemas de TV digital suportados:"
-#: lib/libdvbv5/dvb-fe.c:334
+#: lib/libdvbv5/dvb-fe.c:332
msgid ""
"Warning: new delivery systems like ISDB-T, ISDB-S, DMB-TH, DSS, ATSC-MH will "
"be miss-detected by a DVBv5.4 or earlier API call"
@@ -83,217 +83,217 @@
"Aviso: novos sistemas de TV digital como ISDB-T, ISDB-S, DMB-TH, DSS, ATSC-"
"MH serão mal detetados por uma chamada de API DVBv5.4 ou anterior"
-#: lib/libdvbv5/dvb-fe.c:365
+#: lib/libdvbv5/dvb-fe.c:363
msgid "Frequency range for the current standard: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:368
+#: lib/libdvbv5/dvb-fe.c:366
#, c-format
msgid "From: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:370
+#: lib/libdvbv5/dvb-fe.c:368
#, c-format
msgid "To: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:373
+#: lib/libdvbv5/dvb-fe.c:371
#, c-format
msgid "Step: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:377
+#: lib/libdvbv5/dvb-fe.c:375
#, c-format
msgid "Tolerance: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:381
+#: lib/libdvbv5/dvb-fe.c:379
msgid "Symbol rate ranges for the current standard: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:383
+#: lib/libdvbv5/dvb-fe.c:381
#, c-format
msgid "From: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:385
+#: lib/libdvbv5/dvb-fe.c:383
#, c-format
msgid "To: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:388
+#: lib/libdvbv5/dvb-fe.c:386
#, c-format
msgid "Tolerance: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:518
+#: lib/libdvbv5/dvb-fe.c:516
msgid "Set delivery system"
msgstr "Configura sistema de TV digital"
-#: lib/libdvbv5/dvb-fe.c:530
+#: lib/libdvbv5/dvb-fe.c:528
msgid "Can't retrieve DVB information for the new delivery system."
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:615
+#: lib/libdvbv5/dvb-fe.c:613
#, c-format
msgid "Using a DVBv3 compat file for %s"
msgstr "Usando um arquivo compatível com a API DVBv3 para %s"
-#: lib/libdvbv5/dvb-fe.c:704
+#: lib/libdvbv5/dvb-fe.c:702
#, c-format
msgid "command %s (%d) not found during retrieve"
msgstr "comando %s (%d) não encontrado durante leitura"
-#: lib/libdvbv5/dvb-fe.c:721
+#: lib/libdvbv5/dvb-fe.c:719
#, c-format
msgid "command %s (%d) not found during store"
msgstr "comando %s (%d) não encontrado durante armazenamento"
-#: lib/libdvbv5/dvb-fe.c:783
+#: lib/libdvbv5/dvb-fe.c:781
#, c-format
msgid "Got parameters for %s:"
msgstr "Obtidos parâmetros para %s:"
-#: lib/libdvbv5/dvb-fe.c:902
+#: lib/libdvbv5/dvb-fe.c:900
msgid "Setting LNA"
msgstr "Configurando LNA"
-#: lib/libdvbv5/dvb-fe.c:905
+#: lib/libdvbv5/dvb-fe.c:903
#, c-format
msgid "LNA is %s"
msgstr "LNA está %s"
-#: lib/libdvbv5/dvb-fe.c:905 lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:903 lib/libdvbv5/dvb-fe.c:1901
msgid "ON"
msgstr "LIGADO"
-#: lib/libdvbv5/dvb-fe.c:905 lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:903 lib/libdvbv5/dvb-fe.c:1901
msgid "OFF"
msgstr "DESLIGADO"
-#: lib/libdvbv5/dvb-fe.c:1005
+#: lib/libdvbv5/dvb-fe.c:1003
#, c-format
msgid "%s not found on store"
msgstr "%s não encontrado durante armazenamento"
-#: lib/libdvbv5/dvb-fe.c:1077 lib/libdvbv5/dvb-fe.c:1092
+#: lib/libdvbv5/dvb-fe.c:1075 lib/libdvbv5/dvb-fe.c:1090
#, c-format
msgid "%s not found on retrieve"
msgstr "%s não encontrado durante leitura"
-#: lib/libdvbv5/dvb-fe.c:1099
+#: lib/libdvbv5/dvb-fe.c:1097
#, c-format
msgid "%s not available"
msgstr "%s não encontrado"
-#: lib/libdvbv5/dvb-fe.c:1106
+#: lib/libdvbv5/dvb-fe.c:1104
#, c-format
msgid "Stats for %s = %d"
msgstr "Estatísticas para %s = %d"
-#: lib/libdvbv5/dvb-fe.c:1531 lib/libdvbv5/dvb-fe.c:1561
+#: lib/libdvbv5/dvb-fe.c:1529 lib/libdvbv5/dvb-fe.c:1559
msgid "Status: "
msgstr "Estado:"
-#: lib/libdvbv5/dvb-fe.c:1536
+#: lib/libdvbv5/dvb-fe.c:1534
#, c-format
msgid "BER: %d, Strength: %d, SNR: %d, UCB: %d"
msgstr "BER: %d, Potência: %d, SNR: %d, UCB: %d"
-#: lib/libdvbv5/dvb-fe.c:1690
+#: lib/libdvbv5/dvb-fe.c:1688
msgid "RF"
msgstr "RF"
-#: lib/libdvbv5/dvb-fe.c:1691
+#: lib/libdvbv5/dvb-fe.c:1689
msgid "Carrier"
msgstr "Portadora"
-#: lib/libdvbv5/dvb-fe.c:1692
+#: lib/libdvbv5/dvb-fe.c:1690
msgid "Viterbi"
msgstr "Viterbi"
-#: lib/libdvbv5/dvb-fe.c:1693
+#: lib/libdvbv5/dvb-fe.c:1691
msgid "Sync"
msgstr "Sinc"
-#: lib/libdvbv5/dvb-fe.c:1694
+#: lib/libdvbv5/dvb-fe.c:1692
msgid "Lock"
msgstr "Travado"
-#: lib/libdvbv5/dvb-fe.c:1695
+#: lib/libdvbv5/dvb-fe.c:1693
msgid "Timeout"
msgstr "Timeout"
-#: lib/libdvbv5/dvb-fe.c:1696
+#: lib/libdvbv5/dvb-fe.c:1694
msgid "Reinit"
msgstr "Reinicio"
-#: lib/libdvbv5/dvb-fe.c:1700
+#: lib/libdvbv5/dvb-fe.c:1698
msgid "Poor"
msgstr "Ruim"
-#: lib/libdvbv5/dvb-fe.c:1701
+#: lib/libdvbv5/dvb-fe.c:1699
msgid "Ok"
msgstr "Ok"
-#: lib/libdvbv5/dvb-fe.c:1702
+#: lib/libdvbv5/dvb-fe.c:1700
msgid "Good"
msgstr "Bom"
-#: lib/libdvbv5/dvb-fe.c:1725
+#: lib/libdvbv5/dvb-fe.c:1723
msgid "Error: no adapter status"
msgstr "Erro: sem estado do adaptador"
-#: lib/libdvbv5/dvb-fe.c:1737
+#: lib/libdvbv5/dvb-fe.c:1735
#, c-format
msgid "%-7s"
msgstr "%-9s"
-#: lib/libdvbv5/dvb-fe.c:1744
+#: lib/libdvbv5/dvb-fe.c:1742
#, c-format
msgid "%7s"
msgstr "%9s"
-#: lib/libdvbv5/dvb-fe.c:1789
+#: lib/libdvbv5/dvb-fe.c:1787
#, c-format
msgid " Layer %c:"
msgstr " Camada %c:"
-#: lib/libdvbv5/dvb-fe.c:1864
+#: lib/libdvbv5/dvb-fe.c:1862
msgid "SEC: set voltage to OFF"
msgstr "SEC: desliga voltagem"
-#: lib/libdvbv5/dvb-fe.c:1868
+#: lib/libdvbv5/dvb-fe.c:1866
#, c-format
msgid "SEC: set voltage to %sV"
msgstr "SEC: ajusta voltagem para %sV"
-#: lib/libdvbv5/dvb-fe.c:1887
+#: lib/libdvbv5/dvb-fe.c:1885
#, c-format
msgid "DiSEqC TONE: %s"
msgstr "TOM DiSEqC: %s"
-#: lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:1901
#, c-format
msgid "DiSEqC HIGH LNB VOLTAGE: %s"
msgstr "VOLTAGEM ALTA DiSEqC para LNB: %s"
-#: lib/libdvbv5/dvb-fe.c:1921
+#: lib/libdvbv5/dvb-fe.c:1919
#, c-format
msgid "DiSEqC BURST: %s"
msgstr "DiSEqC BURST: %s"
-#: lib/libdvbv5/dvb-fe.c:1947
+#: lib/libdvbv5/dvb-fe.c:1945
#, c-format
msgid "DiSEqC command: "
msgstr "Comando DiSEqC:"
-#: lib/libdvbv5/dvb-fe.c:1997
+#: lib/libdvbv5/dvb-fe.c:1995
#, c-format
msgid "Assuming you're in %s.\n"
msgstr "Assumindo que está em %s.\n"
-#: lib/libdvbv5/dvb-fe.c:2000
+#: lib/libdvbv5/dvb-fe.c:1998
msgid "Failed to guess country from the current locale setting.\n"
msgstr ""
"Falha na identificação do país baseado na configuração atual de locale.\n"
@@ -536,17 +536,18 @@
msgstr "DEBUG "
#: lib/libdvbv5/dvb-sat.c:56
-msgid "Universal, Europe"
-msgstr "Universal, Europa"
+#, fuzzy
+msgid "Astra 19.2E, European Universal Ku (extended)"
+msgstr "Astra 1E, Europeu Universal banda KU (extendido)"
#: lib/libdvbv5/dvb-sat.c:73
+msgid "Old European Universal. Nowadays mostly replaced by Astra 19.2E"
+msgstr ""
+
+#: lib/libdvbv5/dvb-sat.c:90
msgid "Expressvu, North America"
msgstr "Expressvu, América do Norte"
-#: lib/libdvbv5/dvb-sat.c:86
-msgid "Astra 1E, European Universal Ku (extended)"
-msgstr "Astra 1E, Europeu Universal banda KU (extendido)"
-
#: lib/libdvbv5/dvb-sat.c:103
msgid "Standard"
msgstr "Padrão"
@@ -803,6 +804,9 @@
msgid "symbol rate not found"
msgstr "taxa de símbolo não encontrada"
+#~ msgid "Universal, Europe"
+#~ msgstr "Universal, Europa"
+
#~ msgid "udev_device_get_sysname failed"
#~ msgstr "udev_device_get_sysname falhou"
diff -Nru v4l-utils-1.16.3/libdvbv5-po/uk.po v4l-utils-1.16.5/libdvbv5-po/uk.po
--- v4l-utils-1.16.3/libdvbv5-po/uk.po 2018-12-15 19:17:28.000000000 +0100
+++ v4l-utils-1.16.5/libdvbv5-po/uk.po 2019-03-28 20:40:19.000000000 +0100
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: v4l-utils 1.8.1\n"
"Report-Msgid-Bugs-To: linux-media@vger.Kernel.org\n"
-"POT-Creation-Date: 2018-12-15 19:17+0100\n"
+"POT-Creation-Date: 2019-03-28 20:40+0100\n"
"PO-Revision-Date: 2015-12-30 10:00+0000\n"
"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -16,57 +16,57 @@
"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"
-#: lib/libdvbv5/dvb-fe.c:151
+#: lib/libdvbv5/dvb-fe.c:150
#, c-format
msgid "adapter %d, frontend %d not found"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:159
+#: lib/libdvbv5/dvb-fe.c:157
msgid "Detected dvbloopback"
msgstr ""
#: lib/libdvbv5/dvb-fe.c:165
#, c-format
-msgid "fname calloc: %s"
-msgstr "calloc для fname: %s"
-
-#: lib/libdvbv5/dvb-fe.c:170
-#, c-format
msgid "parms calloc: %s"
msgstr "calloc для parms: %s"
-#: lib/libdvbv5/dvb-fe.c:205
+#: lib/libdvbv5/dvb-fe.c:199
#, c-format
msgid "%s while opening %s"
msgstr "%s під час спроби відкрити %s"
-#: lib/libdvbv5/dvb-fe.c:221
+#: lib/libdvbv5/dvb-fe.c:214
#, c-format
msgid "Device %s (%s) capabilities:"
msgstr "Можливості пристрою %s (%s):"
-#: lib/libdvbv5/dvb-fe.c:247
+#: lib/libdvbv5/dvb-fe.c:224
+#, c-format
+msgid "fname calloc: %s"
+msgstr "calloc для fname: %s"
+
+#: lib/libdvbv5/dvb-fe.c:245
#, c-format
msgid "DVB API Version %d.%d%s, Current v5 delivery system: %s"
msgstr ""
"Версія програмного інтерфейсу DVB %d.%d%s, поточна система надання даних v5: "
"%s"
-#: lib/libdvbv5/dvb-fe.c:250
+#: lib/libdvbv5/dvb-fe.c:248
msgid " (forcing DVBv3 calls)"
msgstr " (примусово використовуємо виклики DVBv3)"
-#: lib/libdvbv5/dvb-fe.c:295
+#: lib/libdvbv5/dvb-fe.c:293
msgid "delivery system not detected"
msgstr "не виявлено системи надання даних"
-#: lib/libdvbv5/dvb-fe.c:316
+#: lib/libdvbv5/dvb-fe.c:314
msgid "driver returned 0 supported delivery systems!"
msgstr ""
"драйвером повернуто дані щодо нульової кількості підтримуваних систем "
"надання даних!"
-#: lib/libdvbv5/dvb-fe.c:324
+#: lib/libdvbv5/dvb-fe.c:322
#, fuzzy
msgid "Supported delivery system: "
msgid_plural "Supported delivery systems: "
@@ -74,7 +74,7 @@
msgstr[1] "Підтримувані системи надання даних%s: "
msgstr[2] "Підтримувані системи надання даних%s: "
-#: lib/libdvbv5/dvb-fe.c:334
+#: lib/libdvbv5/dvb-fe.c:332
msgid ""
"Warning: new delivery systems like ISDB-T, ISDB-S, DMB-TH, DSS, ATSC-MH will "
"be miss-detected by a DVBv5.4 or earlier API call"
@@ -83,217 +83,217 @@
"інтерфейсу DVB 5.4 або раніших версій нових систем надання даних, зокрема "
"ISDB-T, ISDB-S, DMB-TH, DSS, ATSC-MH, можливі помилки"
-#: lib/libdvbv5/dvb-fe.c:365
+#: lib/libdvbv5/dvb-fe.c:363
msgid "Frequency range for the current standard: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:368
+#: lib/libdvbv5/dvb-fe.c:366
#, c-format
msgid "From: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:370
+#: lib/libdvbv5/dvb-fe.c:368
#, c-format
msgid "To: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:373
+#: lib/libdvbv5/dvb-fe.c:371
#, c-format
msgid "Step: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:377
+#: lib/libdvbv5/dvb-fe.c:375
#, c-format
msgid "Tolerance: %11sHz"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:381
+#: lib/libdvbv5/dvb-fe.c:379
msgid "Symbol rate ranges for the current standard: "
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:383
+#: lib/libdvbv5/dvb-fe.c:381
#, c-format
msgid "From: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:385
+#: lib/libdvbv5/dvb-fe.c:383
#, c-format
msgid "To: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:388
+#: lib/libdvbv5/dvb-fe.c:386
#, c-format
msgid "Tolerance: %11sBauds"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:518
+#: lib/libdvbv5/dvb-fe.c:516
msgid "Set delivery system"
msgstr "Встановити систему надання даних"
-#: lib/libdvbv5/dvb-fe.c:530
+#: lib/libdvbv5/dvb-fe.c:528
msgid "Can't retrieve DVB information for the new delivery system."
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:615
+#: lib/libdvbv5/dvb-fe.c:613
#, c-format
msgid "Using a DVBv3 compat file for %s"
msgstr "Використовуємо файл сумісності із DVBv3 для %s"
-#: lib/libdvbv5/dvb-fe.c:704
+#: lib/libdvbv5/dvb-fe.c:702
#, c-format
msgid "command %s (%d) not found during retrieve"
msgstr "під час отримання не виявлено команди %s (%d)"
-#: lib/libdvbv5/dvb-fe.c:721
+#: lib/libdvbv5/dvb-fe.c:719
#, c-format
msgid "command %s (%d) not found during store"
msgstr "під час зберігання не виявлено команди %s (%d)"
-#: lib/libdvbv5/dvb-fe.c:783
+#: lib/libdvbv5/dvb-fe.c:781
#, c-format
msgid "Got parameters for %s:"
msgstr "Отримано параметри для %s:"
-#: lib/libdvbv5/dvb-fe.c:902
+#: lib/libdvbv5/dvb-fe.c:900
msgid "Setting LNA"
msgstr "Встановлюємо малошумний підсилювач"
-#: lib/libdvbv5/dvb-fe.c:905
+#: lib/libdvbv5/dvb-fe.c:903
#, c-format
msgid "LNA is %s"
msgstr "Малошумним підсилювачем є %s"
-#: lib/libdvbv5/dvb-fe.c:905 lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:903 lib/libdvbv5/dvb-fe.c:1901
msgid "ON"
msgstr "УВІМКН."
-#: lib/libdvbv5/dvb-fe.c:905 lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:903 lib/libdvbv5/dvb-fe.c:1901
msgid "OFF"
msgstr "ВИМКН."
-#: lib/libdvbv5/dvb-fe.c:1005
+#: lib/libdvbv5/dvb-fe.c:1003
#, c-format
msgid "%s not found on store"
msgstr "%s не виявлено під час збереження"
-#: lib/libdvbv5/dvb-fe.c:1077 lib/libdvbv5/dvb-fe.c:1092
+#: lib/libdvbv5/dvb-fe.c:1075 lib/libdvbv5/dvb-fe.c:1090
#, c-format
msgid "%s not found on retrieve"
msgstr "%s не виявлено під час отримання"
-#: lib/libdvbv5/dvb-fe.c:1099
+#: lib/libdvbv5/dvb-fe.c:1097
#, c-format
msgid "%s not available"
msgstr "%s недоступний"
-#: lib/libdvbv5/dvb-fe.c:1106
+#: lib/libdvbv5/dvb-fe.c:1104
#, c-format
msgid "Stats for %s = %d"
msgstr "Статистика для %s = %d"
-#: lib/libdvbv5/dvb-fe.c:1531 lib/libdvbv5/dvb-fe.c:1561
+#: lib/libdvbv5/dvb-fe.c:1529 lib/libdvbv5/dvb-fe.c:1559
msgid "Status: "
msgstr "Стан: "
-#: lib/libdvbv5/dvb-fe.c:1536
+#: lib/libdvbv5/dvb-fe.c:1534
#, c-format
msgid "BER: %d, Strength: %d, SNR: %d, UCB: %d"
msgstr "BER: %d, потужність: %d, ВСШ: %d, UCB: %d"
-#: lib/libdvbv5/dvb-fe.c:1690
+#: lib/libdvbv5/dvb-fe.c:1688
msgid "RF"
msgstr "РЧ"
-#: lib/libdvbv5/dvb-fe.c:1691
+#: lib/libdvbv5/dvb-fe.c:1689
msgid "Carrier"
msgstr "Носій сигналу"
-#: lib/libdvbv5/dvb-fe.c:1692
+#: lib/libdvbv5/dvb-fe.c:1690
msgid "Viterbi"
msgstr "Вітербі"
-#: lib/libdvbv5/dvb-fe.c:1693
+#: lib/libdvbv5/dvb-fe.c:1691
msgid "Sync"
msgstr "Синхронізувати"
-#: lib/libdvbv5/dvb-fe.c:1694
+#: lib/libdvbv5/dvb-fe.c:1692
msgid "Lock"
msgstr "Заблокувати"
-#: lib/libdvbv5/dvb-fe.c:1695
+#: lib/libdvbv5/dvb-fe.c:1693
msgid "Timeout"
msgstr "Час очікування"
-#: lib/libdvbv5/dvb-fe.c:1696
+#: lib/libdvbv5/dvb-fe.c:1694
msgid "Reinit"
msgstr "Переініціалізація"
-#: lib/libdvbv5/dvb-fe.c:1700
+#: lib/libdvbv5/dvb-fe.c:1698
msgid "Poor"
msgstr "Погана"
-#: lib/libdvbv5/dvb-fe.c:1701
+#: lib/libdvbv5/dvb-fe.c:1699
msgid "Ok"
msgstr "Добра"
-#: lib/libdvbv5/dvb-fe.c:1702
+#: lib/libdvbv5/dvb-fe.c:1700
msgid "Good"
msgstr "Чудова"
-#: lib/libdvbv5/dvb-fe.c:1725
+#: lib/libdvbv5/dvb-fe.c:1723
msgid "Error: no adapter status"
msgstr "Помилка: немає даних щодо стану адаптера"
-#: lib/libdvbv5/dvb-fe.c:1737
+#: lib/libdvbv5/dvb-fe.c:1735
#, c-format
msgid "%-7s"
msgstr "%-7s"
-#: lib/libdvbv5/dvb-fe.c:1744
+#: lib/libdvbv5/dvb-fe.c:1742
#, c-format
msgid "%7s"
msgstr "%7s"
-#: lib/libdvbv5/dvb-fe.c:1789
+#: lib/libdvbv5/dvb-fe.c:1787
#, c-format
msgid " Layer %c:"
msgstr " Шар %c:"
-#: lib/libdvbv5/dvb-fe.c:1864
+#: lib/libdvbv5/dvb-fe.c:1862
msgid "SEC: set voltage to OFF"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1868
+#: lib/libdvbv5/dvb-fe.c:1866
#, c-format
msgid "SEC: set voltage to %sV"
msgstr ""
-#: lib/libdvbv5/dvb-fe.c:1887
+#: lib/libdvbv5/dvb-fe.c:1885
#, c-format
msgid "DiSEqC TONE: %s"
msgstr "ТОН DiSEqC: %s"
-#: lib/libdvbv5/dvb-fe.c:1903
+#: lib/libdvbv5/dvb-fe.c:1901
#, c-format
msgid "DiSEqC HIGH LNB VOLTAGE: %s"
msgstr "ЖИВЛЕННЯ LNB DiSEqC (верхній поріг): %s"
-#: lib/libdvbv5/dvb-fe.c:1921
+#: lib/libdvbv5/dvb-fe.c:1919
#, c-format
msgid "DiSEqC BURST: %s"
msgstr "ВИКИД DiSEqC: %s"
-#: lib/libdvbv5/dvb-fe.c:1947
+#: lib/libdvbv5/dvb-fe.c:1945
#, c-format
msgid "DiSEqC command: "
msgstr "Команда DiSEqC: "
-#: lib/libdvbv5/dvb-fe.c:1997
+#: lib/libdvbv5/dvb-fe.c:1995
#, c-format
msgid "Assuming you're in %s.\n"
msgstr "Припускаємо, що ви у країні %s.\n"
-#: lib/libdvbv5/dvb-fe.c:2000
+#: lib/libdvbv5/dvb-fe.c:1998
msgid "Failed to guess country from the current locale setting.\n"
msgstr "Не вдалося визначити країну за поточними параметрами локалі.\n"
@@ -542,15 +542,15 @@
msgstr "ДІАГН. "
#: lib/libdvbv5/dvb-sat.c:56
-msgid "Universal, Europe"
+msgid "Astra 19.2E, European Universal Ku (extended)"
msgstr ""
#: lib/libdvbv5/dvb-sat.c:73
-msgid "Expressvu, North America"
+msgid "Old European Universal. Nowadays mostly replaced by Astra 19.2E"
msgstr ""
-#: lib/libdvbv5/dvb-sat.c:86
-msgid "Astra 1E, European Universal Ku (extended)"
+#: lib/libdvbv5/dvb-sat.c:90
+msgid "Expressvu, North America"
msgstr ""
#: lib/libdvbv5/dvb-sat.c:103
diff -Nru v4l-utils-1.16.3/m4/libtool.m4 v4l-utils-1.16.5/m4/libtool.m4
--- v4l-utils-1.16.3/m4/libtool.m4 2018-12-15 19:17:02.000000000 +0100
+++ v4l-utils-1.16.5/m4/libtool.m4 2019-03-28 20:39:53.000000000 +0100
@@ -4704,6 +4704,12 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
+ # flang / f18. f95 an alias for gfortran or flang on Debian
+ flang* | f18* | f95*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
diff -Nru v4l-utils-1.16.3/utils/cec-compliance/cec-compliance.1 v4l-utils-1.16.5/utils/cec-compliance/cec-compliance.1
--- v4l-utils-1.16.3/utils/cec-compliance/cec-compliance.1 2018-12-15 19:17:21.000000000 +0100
+++ v4l-utils-1.16.5/utils/cec-compliance/cec-compliance.1 2019-03-28 20:40:13.000000000 +0100
@@ -1,4 +1,4 @@
-.TH "CEC-COMPLIANCE" "1" "August 2016" "v4l-utils 1.16.3" "User Commands"
+.TH "CEC-COMPLIANCE" "1" "August 2016" "v4l-utils 1.16.5" "User Commands"
.SH NAME
cec-compliance - An application to verify remote CEC devices
.SH SYNOPSIS
diff -Nru v4l-utils-1.16.3/utils/cec-ctl/cec-ctl.1 v4l-utils-1.16.5/utils/cec-ctl/cec-ctl.1
--- v4l-utils-1.16.3/utils/cec-ctl/cec-ctl.1 2018-12-15 19:17:21.000000000 +0100
+++ v4l-utils-1.16.5/utils/cec-ctl/cec-ctl.1 2019-03-28 20:40:13.000000000 +0100
@@ -1,4 +1,4 @@
-.TH "CEC-CTL" "1" "August 2016" "v4l-utils 1.16.3" "User Commands"
+.TH "CEC-CTL" "1" "August 2016" "v4l-utils 1.16.5" "User Commands"
.SH NAME
cec-ctl - An application to control cec devices
.SH SYNOPSIS
diff -Nru v4l-utils-1.16.3/utils/cec-follower/cec-follower.1 v4l-utils-1.16.5/utils/cec-follower/cec-follower.1
--- v4l-utils-1.16.3/utils/cec-follower/cec-follower.1 2018-12-15 19:17:21.000000000 +0100
+++ v4l-utils-1.16.5/utils/cec-follower/cec-follower.1 2019-03-28 20:40:13.000000000 +0100
@@ -1,4 +1,4 @@
-.TH "CEC-FOLLOWER" "1" "August 2016" "v4l-utils 1.16.3" "User Commands"
+.TH "CEC-FOLLOWER" "1" "August 2016" "v4l-utils 1.16.5" "User Commands"
.SH NAME
cec-follower - An application to emulate CEC followers
.SH SYNOPSIS
diff -Nru v4l-utils-1.16.3/utils/dvb/dvb-fe-tool.c v4l-utils-1.16.5/utils/dvb/dvb-fe-tool.c
--- v4l-utils-1.16.3/utils/dvb/dvb-fe-tool.c 2017-12-27 14:50:55.000000000 +0100
+++ v4l-utils-1.16.5/utils/dvb/dvb-fe-tool.c 2019-03-28 20:36:33.000000000 +0100
@@ -42,7 +42,7 @@
#define PROGRAM_NAME "dvb-fe-tool"
const char *argp_program_version = PROGRAM_NAME " version " V4L_UTILS_VERSION;
-const char *argp_program_bug_address = "Mauro Carvalho Chehab <m.chehab@samsung.com>";
+const char *argp_program_bug_address = "Mauro Carvalho Chehab <mchehab@kernel.org>";
static const char doc[] = N_(
"\nA DVB frontend tool using API version 5\n"
diff -Nru v4l-utils-1.16.3/utils/dvb/dvb-format-convert.c v4l-utils-1.16.5/utils/dvb/dvb-format-convert.c
--- v4l-utils-1.16.3/utils/dvb/dvb-format-convert.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/utils/dvb/dvb-format-convert.c 2019-03-28 20:36:33.000000000 +0100
@@ -66,7 +66,7 @@
};
const char *argp_program_version = PROGRAM_NAME " version " V4L_UTILS_VERSION;
-const char *argp_program_bug_address = "Mauro Carvalho Chehab <m.chehab@samsung.com>";
+const char *argp_program_bug_address = "Mauro Carvalho Chehab <mchehab@kernel.org>";
static error_t parse_opt(int k, char *optarg, struct argp_state *state)
{
@@ -123,7 +123,7 @@
int main(int argc, char **argv)
{
- struct arguments args;
+ struct arguments args = {};
int idx = -1, missing = 0;
const struct argp argp = {
.options = options,
diff -Nru v4l-utils-1.16.3/utils/dvb/dvbv5-daemon.c v4l-utils-1.16.5/utils/dvb/dvbv5-daemon.c
--- v4l-utils-1.16.3/utils/dvb/dvbv5-daemon.c 2018-08-17 19:44:28.000000000 +0200
+++ v4l-utils-1.16.5/utils/dvb/dvbv5-daemon.c 2019-03-28 20:36:33.000000000 +0100
@@ -77,7 +77,7 @@
#define PROGRAM_NAME "dvbv5-daemon"
const char *argp_program_version = PROGRAM_NAME " version " V4L_UTILS_VERSION;
-const char *argp_program_bug_address = "Mauro Carvalho Chehab <m.chehab@samsung.com>";
+const char *argp_program_bug_address = "Mauro Carvalho Chehab <mchehab@kernel.org>";
static const char doc[] = N_(
"\nA DVB remote daemon using API version 5\n");
diff -Nru v4l-utils-1.16.3/utils/dvb/dvbv5-scan.c v4l-utils-1.16.5/utils/dvb/dvbv5-scan.c
--- v4l-utils-1.16.3/utils/dvb/dvbv5-scan.c 2017-12-27 14:50:55.000000000 +0100
+++ v4l-utils-1.16.5/utils/dvb/dvbv5-scan.c 2019-03-28 20:36:33.000000000 +0100
@@ -56,7 +56,7 @@
#define DEFAULT_OUTPUT "dvb_channel.conf"
const char *argp_program_version = PROGRAM_NAME " version " V4L_UTILS_VERSION;
-const char *argp_program_bug_address = "Mauro Carvalho Chehab <m.chehab@samsung.com>";
+const char *argp_program_bug_address = "Mauro Carvalho Chehab <mchehab@kernel.org>";
struct arguments {
char *confname, *lnb_name, *output, *demux_dev;
@@ -450,7 +450,7 @@
int main(int argc, char **argv)
{
- struct arguments args;
+ struct arguments args = {};
int err, lnb = -1,idx = -1;
struct dvb_device *dvb;
struct dvb_dev_list *dvb_dev;
diff -Nru v4l-utils-1.16.3/utils/dvb/dvbv5-zap.c v4l-utils-1.16.5/utils/dvb/dvbv5-zap.c
--- v4l-utils-1.16.3/utils/dvb/dvbv5-zap.c 2018-08-17 19:44:28.000000000 +0200
+++ v4l-utils-1.16.5/utils/dvb/dvbv5-zap.c 2019-03-28 20:36:33.000000000 +0100
@@ -83,7 +83,7 @@
const int NANO_SECONDS_IN_SEC = 1000000000;
const char *argp_program_version = PROGRAM_NAME " version " V4L_UTILS_VERSION;
-const char *argp_program_bug_address = "Mauro Carvalho Chehab <m.chehab@samsung.com>";
+const char *argp_program_bug_address = "Mauro Carvalho Chehab <mchehab@kernel.org>";
struct arguments {
char *confname, *lnb_name, *output, *demux_dev, *dvr_dev, *dvr_fname;
@@ -373,6 +373,7 @@
signal(SIGALRM, do_timeout);
} else {
/* something has gone wrong ... exit */
+ fprintf(stderr, "Forcing program stop due to timeout or terminate signal\n");
exit(1);
}
}
@@ -1016,9 +1017,11 @@
}
}
+static char *default_dvr_pipe = "/tmp/dvr-pipe";
+
int main(int argc, char **argv)
{
- struct arguments args;
+ struct arguments args = {};
char *homedir = getenv("HOME");
char *channel = NULL;
int lnb = -1, idx = -1;
@@ -1046,11 +1049,10 @@
textdomain (PACKAGE);
#endif
- memset(&args, 0, sizeof(args));
args.sat_number = -1;
args.lna = LNA_AUTO;
args.input_format = FILE_DVBV5;
- args.dvr_pipe = "/tmp/dvr-pipe";
+ args.dvr_pipe = default_dvr_pipe;
args.low_traffic = 1;
if (argp_parse(&argp, argc, argv, ARGP_NO_HELP | ARGP_NO_EXIT, &idx, &args)) {
@@ -1365,7 +1367,7 @@
get_show_stats(stderr, &args, parms, 0);
} else {
/* Wait until timeout or being killed */
- while (1) {
+ while (!timeout_flag) {
get_show_stats(stderr, &args, parms, 1);
usleep(1000000);
}
@@ -1373,9 +1375,25 @@
err = 0;
err:
+ dvb_dev_free(dvb);
+
+ /*
+ * Just to make Valgrind happier. It should be noticed
+ * That, if an error happens or if the program exits via
+ * timeout code at forced mode, it may not free those.
+ */
if (args.confname)
free(args.confname);
- dvb_dev_free(dvb);
+ if (args.filename)
+ free(args.filename);
+ if (args.lnb_name)
+ free(args.lnb_name);
+ if (args.search)
+ free(args.search);
+ if (args.server)
+ free(args.search);
+ if (args.dvr_pipe != default_dvr_pipe)
+ free(args.dvr_pipe);
return err;
}
diff -Nru v4l-utils-1.16.3/utils/keytable/ir-keytable.1 v4l-utils-1.16.5/utils/keytable/ir-keytable.1
--- v4l-utils-1.16.3/utils/keytable/ir-keytable.1 2018-12-15 19:17:21.000000000 +0100
+++ v4l-utils-1.16.5/utils/keytable/ir-keytable.1 2019-03-28 20:40:14.000000000 +0100
@@ -1,4 +1,4 @@
-.TH "IR\-KEYTABLE" "1" "Fri Oct 3 2014" "v4l-utils 1.16.3" "User Commands"
+.TH "IR\-KEYTABLE" "1" "Fri Oct 3 2014" "v4l-utils 1.16.5" "User Commands"
.SH NAME
ir\-keytable \- a swiss\-knife tool to handle Remote Controllers.
.SH SYNOPSIS
diff -Nru v4l-utils-1.16.3/utils/keytable/keytable.c v4l-utils-1.16.5/utils/keytable/keytable.c
--- v4l-utils-1.16.3/utils/keytable/keytable.c 2018-11-09 14:11:52.000000000 +0100
+++ v4l-utils-1.16.5/utils/keytable/keytable.c 2019-03-28 20:36:33.000000000 +0100
@@ -222,7 +222,7 @@
}
const char *argp_program_version = "IR keytable control version " V4L_UTILS_VERSION;
-const char *argp_program_bug_address = "Mauro Carvalho Chehab <m.chehab@samsung.com>";
+const char *argp_program_bug_address = "Mauro Carvalho Chehab <mchehab@kernel.org>";
static const char doc[] = N_(
"\nAllows get/set IR keycode/scancode tables\n"
diff -Nru v4l-utils-1.16.3/utils/libv4l2util/v4l2_driver.c v4l-utils-1.16.5/utils/libv4l2util/v4l2_driver.c
--- v4l-utils-1.16.3/utils/libv4l2util/v4l2_driver.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/utils/libv4l2util/v4l2_driver.c 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@kernel.org>
The libv4l2util Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff -Nru v4l-utils-1.16.3/utils/libv4l2util/v4l2_driver.h v4l-utils-1.16.5/utils/libv4l2util/v4l2_driver.h
--- v4l-utils-1.16.3/utils/libv4l2util/v4l2_driver.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/utils/libv4l2util/v4l2_driver.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@kernel.org>
The libv4l2util Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff -Nru v4l-utils-1.16.3/utils/qv4l2/qv4l2.1 v4l-utils-1.16.5/utils/qv4l2/qv4l2.1
--- v4l-utils-1.16.3/utils/qv4l2/qv4l2.1 2018-12-15 19:17:21.000000000 +0100
+++ v4l-utils-1.16.5/utils/qv4l2/qv4l2.1 2019-03-28 20:40:13.000000000 +0100
@@ -1,4 +1,4 @@
-.TH "QV4L2" "1" "March 2015" "v4l-utils 1.16.3" "User Commands"
+.TH "QV4L2" "1" "March 2015" "v4l-utils 1.16.5" "User Commands"
.SH NAME
qv4l2 - A test bench application for video4linux devices
.SH SYNOPSIS
diff -Nru v4l-utils-1.16.3/utils/qvidcap/qvidcap.1 v4l-utils-1.16.5/utils/qvidcap/qvidcap.1
--- v4l-utils-1.16.3/utils/qvidcap/qvidcap.1 2018-12-15 19:17:21.000000000 +0100
+++ v4l-utils-1.16.5/utils/qvidcap/qvidcap.1 2019-03-28 20:40:13.000000000 +0100
@@ -1,4 +1,4 @@
-.TH "QVIDCAP" "1" "June 2016" "v4l-utils 1.16.3" "User Commands"
+.TH "QVIDCAP" "1" "June 2016" "v4l-utils 1.16.5" "User Commands"
.SH NAME
qvidcap - A v4l2 video capture viewer
.SH SYNOPSIS
diff -Nru v4l-utils-1.16.3/utils/v4l2-compliance/v4l2-compliance.1 v4l-utils-1.16.5/utils/v4l2-compliance/v4l2-compliance.1
--- v4l-utils-1.16.3/utils/v4l2-compliance/v4l2-compliance.1 2018-12-15 19:17:21.000000000 +0100
+++ v4l-utils-1.16.5/utils/v4l2-compliance/v4l2-compliance.1 2019-03-28 20:40:14.000000000 +0100
@@ -1,4 +1,4 @@
-.TH "V4L2-COMPLIANCE" "1" "March 2015" "v4l-utils 1.16.3" "User Commands"
+.TH "V4L2-COMPLIANCE" "1" "March 2015" "v4l-utils 1.16.5" "User Commands"
.SH NAME
v4l2-compliance - An application to test video4linux drivers
.SH SYNOPSIS
diff -Nru v4l-utils-1.16.3/utils/v4l2-ctl/v4l2-ctl.1 v4l-utils-1.16.5/utils/v4l2-ctl/v4l2-ctl.1
--- v4l-utils-1.16.3/utils/v4l2-ctl/v4l2-ctl.1 2018-12-15 19:17:21.000000000 +0100
+++ v4l-utils-1.16.5/utils/v4l2-ctl/v4l2-ctl.1 2019-03-28 20:40:14.000000000 +0100
@@ -1,4 +1,4 @@
-.TH "V4L2-CTL" "1" "March 2015" "v4l-utils 1.16.3" "User Commands"
+.TH "V4L2-CTL" "1" "March 2015" "v4l-utils 1.16.5" "User Commands"
.SH NAME
v4l2-ctl - An application to control video4linux drivers
.SH SYNOPSIS
diff -Nru v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-ac97.h v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-ac97.h
--- v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-ac97.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-ac97.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@kernel.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation version 2 of the License.
diff -Nru v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-bttv.h v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-bttv.h
--- v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-bttv.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-bttv.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@kernel.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation version 2 of the License.
diff -Nru v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-em28xx.h v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-em28xx.h
--- v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-em28xx.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-em28xx.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@kernel.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation version 2 of the License.
diff -Nru v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg.h v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg.h
--- v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@kernel.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation version 2 of the License.
diff -Nru v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-micron.h v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-micron.h
--- v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-micron.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-micron.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@kernel.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation version 2 of the License.
diff -Nru v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-saa7134.h v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-saa7134.h
--- v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-saa7134.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-saa7134.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@kernel.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation version 2 of the License.
diff -Nru v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-tvp5150.h v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-tvp5150.h
--- v4l-utils-1.16.3/utils/v4l2-dbg/v4l2-dbg-tvp5150.h 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/utils/v4l2-dbg/v4l2-dbg-tvp5150.h 2019-03-28 20:36:33.000000000 +0100
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@infradead.org>
+ Copyright (C) 2008 Mauro Carvalho Chehab <mchehab@kernel.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation version 2 of the License.
diff -Nru v4l-utils-1.16.3/utils/v4l2-sysfs-path/v4l2-sysfs-path.c v4l-utils-1.16.5/utils/v4l2-sysfs-path/v4l2-sysfs-path.c
--- v4l-utils-1.16.3/utils/v4l2-sysfs-path/v4l2-sysfs-path.c 2017-01-22 18:33:34.000000000 +0100
+++ v4l-utils-1.16.5/utils/v4l2-sysfs-path/v4l2-sysfs-path.c 2019-03-28 20:36:33.000000000 +0100
@@ -30,7 +30,7 @@
#include <argp.h>
const char *argp_program_version = "v4l2-sysfs-path version " V4L_UTILS_VERSION;
-const char *argp_program_bug_address = "Mauro Carvalho Chehab <m.chehab@samsung.com>";
+const char *argp_program_bug_address = "Mauro Carvalho Chehab <mchehab@kernel.org>";
static const struct argp_option options[] = {
{"device", 'd', 0, 0, "use alternative device show mode", 0},
diff -Nru v4l-utils-1.16.3/v4l-utils-po/ca.po v4l-utils-1.16.5/v4l-utils-po/ca.po
--- v4l-utils-1.16.3/v4l-utils-po/ca.po 2018-12-15 19:17:28.000000000 +0100
+++ v4l-utils-1.16.5/v4l-utils-po/ca.po 2019-03-28 20:40:18.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: v4l-utils 1.8.1\n"
"Report-Msgid-Bugs-To: linux-media@vger.Kernel.org\n"
-"POT-Creation-Date: 2018-12-15 19:17+0100\n"
+"POT-Creation-Date: 2019-03-28 20:40+0100\n"
"PO-Revision-Date: 2018-02-27 03:38+0000\n"
"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
"Language-Team: Catalan\n"
@@ -321,7 +321,7 @@
#: utils/keytable/keytable.c:877 utils/dvb/dvb-fe-tool.c:160
#: utils/dvb/dvb-format-convert.c:88 utils/dvb/dvbv5-scan.c:421
-#: utils/dvb/dvbv5-zap.c:714
+#: utils/dvb/dvbv5-zap.c:715
#, c-format
msgid ""
"\n"
@@ -1451,41 +1451,41 @@
msgstr ""
#: utils/dvb/dvb-fe-tool.c:199 utils/dvb/dvbv5-scan.c:146
-#: utils/dvb/dvbv5-zap.c:444
+#: utils/dvb/dvbv5-zap.c:445
msgid "Quality"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:202 utils/dvb/dvbv5-scan.c:149
-#: utils/dvb/dvbv5-zap.c:447
+#: utils/dvb/dvbv5-zap.c:448
msgid "Signal"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:205 utils/dvb/dvbv5-scan.c:152
-#: utils/dvb/dvbv5-zap.c:450
+#: utils/dvb/dvbv5-zap.c:451
msgid "C/N"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:208 utils/dvb/dvbv5-scan.c:155
-#: utils/dvb/dvbv5-zap.c:453
+#: utils/dvb/dvbv5-zap.c:454
msgid "UCB"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:211 utils/dvb/dvbv5-scan.c:158
-#: utils/dvb/dvbv5-zap.c:456
+#: utils/dvb/dvbv5-zap.c:457
msgid "postBER"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:214 utils/dvb/dvbv5-scan.c:161
-#: utils/dvb/dvbv5-zap.c:459
+#: utils/dvb/dvbv5-zap.c:460
msgid "preBER"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:217 utils/dvb/dvbv5-scan.c:164
-#: utils/dvb/dvbv5-zap.c:462
+#: utils/dvb/dvbv5-zap.c:463
msgid "PER"
msgstr ""
-#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1098
+#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1100
#, c-format
msgid "Connecting to %s:%d\n"
msgstr ""
@@ -1695,12 +1695,12 @@
msgid "<initial file>"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1084
+#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1086
#, c-format
msgid "Please select one of the LNBf's below:\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1088
+#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1090
#, c-format
msgid "Using LNBf "
msgstr ""
@@ -1710,17 +1710,17 @@
msgid "ERROR: Please specify a valid format\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1110
+#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1112
#, c-format
msgid "Couldn't find demux device node\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1126
+#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1128
#, c-format
msgid "using demux '%s'\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1158
+#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1160
#, c-format
msgid "Failed to set the country code:%s\n"
msgstr ""
@@ -1831,170 +1831,170 @@
msgid "tuning to %i Hz\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:565
+#: utils/dvb/dvbv5-zap.c:566
#, c-format
msgid "buffer overrun at %lld\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:567
+#: utils/dvb/dvbv5-zap.c:568
#, c-format
msgid "buffer overrun after %lld.%02ld seconds\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:592 utils/dvb/dvbv5-zap.c:834
+#: utils/dvb/dvbv5-zap.c:593 utils/dvb/dvbv5-zap.c:835
msgid "Write failed"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:600
+#: utils/dvb/dvbv5-zap.c:601
#, c-format
msgid "received %lld bytes (%lld Kbytes/sec)\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:603
+#: utils/dvb/dvbv5-zap.c:604
#, c-format
msgid "received %lld bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:776 utils/dvb/dvbv5-zap.c:1251
+#: utils/dvb/dvbv5-zap.c:777 utils/dvb/dvbv5-zap.c:1253
#, c-format
msgid "dvb_dev_set_bufsize: buffer set to %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:786
+#: utils/dvb/dvbv5-zap.c:787
#, c-format
msgid " dvb_set_pesfilter to 0x2000\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:795
+#: utils/dvb/dvbv5-zap.c:796
#, c-format
msgid "Can't get timespec\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:801
+#: utils/dvb/dvbv5-zap.c:802
#, c-format
msgid "%.2fs: Starting capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:813
+#: utils/dvb/dvbv5-zap.c:814
#, c-format
msgid "%.2fs: buffer overrun\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:816
+#: utils/dvb/dvbv5-zap.c:817
#, c-format
msgid "%.2fs: read() returned error %zd\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:839
+#: utils/dvb/dvbv5-zap.c:840
#, c-format
msgid "%.2fs: only read %zd bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:846
+#: utils/dvb/dvbv5-zap.c:847
#, c-format
msgid "%.2fs: invalid sync byte. Discarding %zd bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:869
+#: utils/dvb/dvbv5-zap.c:870
#, c-format
msgid "%.2fs: invalid pid: 0x%04x\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:896
+#: utils/dvb/dvbv5-zap.c:897
#, c-format
msgid "%.2fs: pid %d has adaption layer, but size is too small!\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:907
+#: utils/dvb/dvbv5-zap.c:908
#, c-format
msgid "%.2fs: pid %d, expecting %d received %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:952
+#: utils/dvb/dvbv5-zap.c:953
#, c-format
msgid " PID FREQ SPEED TOTAL\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:977
+#: utils/dvb/dvbv5-zap.c:978
#, c-format
msgid "OTHER"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1003
+#: utils/dvb/dvbv5-zap.c:1004
#, c-format
msgid "%.2fs: Stopping capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1039
+#: utils/dvb/dvbv5-zap.c:1042
msgid "DVB zap utility"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1040
+#: utils/dvb/dvbv5-zap.c:1043
msgid "<channel name> [or <frequency> if in monitor mode]"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1118
+#: utils/dvb/dvbv5-zap.c:1120
#, fuzzy, c-format
msgid "Couldn't find dvr device node\n"
msgstr "No s'ha trobat el dispositiu %s\n"
-#: utils/dvb/dvbv5-zap.c:1139
+#: utils/dvb/dvbv5-zap.c:1141
#, c-format
msgid "reading channels from file '%s'\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1180 utils/dvb/dvbv5-zap.c:1300
-#: utils/dvb/dvbv5-zap.c:1352
+#: utils/dvb/dvbv5-zap.c:1182 utils/dvb/dvbv5-zap.c:1302
+#: utils/dvb/dvbv5-zap.c:1354
#, c-format
msgid "open of '%s' failed"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1191
+#: utils/dvb/dvbv5-zap.c:1193
#, c-format
msgid "Service id 0x%04x was not specified at the file\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1204
+#: utils/dvb/dvbv5-zap.c:1206
#, c-format
msgid "couldn't find pmt-pid for sid %04x\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1238
+#: utils/dvb/dvbv5-zap.c:1240
#, c-format
msgid "pass all PID's to TS\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1240
+#: utils/dvb/dvbv5-zap.c:1242
#, c-format
msgid "video pid %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1249 utils/dvb/dvbv5-zap.c:1275
+#: utils/dvb/dvbv5-zap.c:1251 utils/dvb/dvbv5-zap.c:1277
#, c-format
msgid " dvb_set_pesfilter %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1268
+#: utils/dvb/dvbv5-zap.c:1270
#, c-format
msgid "audio pid %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1286
+#: utils/dvb/dvbv5-zap.c:1288
#, c-format
msgid "frontend doesn't lock\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1317
+#: utils/dvb/dvbv5-zap.c:1319
#, c-format
msgid "Record to file '%s' started\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1336
+#: utils/dvb/dvbv5-zap.c:1338
#, c-format
msgid "DVR pipe interface '%s' will be opened\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1360
+#: utils/dvb/dvbv5-zap.c:1362
#, c-format
msgid "DVR interface '%s' can now be opened\n"
msgstr ""
diff -Nru v4l-utils-1.16.3/v4l-utils-po/de.po v4l-utils-1.16.5/v4l-utils-po/de.po
--- v4l-utils-1.16.3/v4l-utils-po/de.po 2018-12-15 19:17:28.000000000 +0100
+++ v4l-utils-1.16.5/v4l-utils-po/de.po 2019-03-28 20:40:18.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: v4l-utils 1.12.3\n"
"Report-Msgid-Bugs-To: linux-media@vger.Kernel.org\n"
-"POT-Creation-Date: 2018-12-15 19:17+0100\n"
+"POT-Creation-Date: 2019-03-28 20:40+0100\n"
"PO-Revision-Date: 2017-04-14 09:40+0200\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -358,7 +358,7 @@
#: utils/keytable/keytable.c:877 utils/dvb/dvb-fe-tool.c:160
#: utils/dvb/dvb-format-convert.c:88 utils/dvb/dvbv5-scan.c:421
-#: utils/dvb/dvbv5-zap.c:714
+#: utils/dvb/dvbv5-zap.c:715
#, c-format
msgid ""
"\n"
@@ -1582,43 +1582,43 @@
msgstr "»dvb_fe_get_stats« fehlgeschlagen"
#: utils/dvb/dvb-fe-tool.c:199 utils/dvb/dvbv5-scan.c:146
-#: utils/dvb/dvbv5-zap.c:444
+#: utils/dvb/dvbv5-zap.c:445
msgid "Quality"
msgstr "Qualität"
#: utils/dvb/dvb-fe-tool.c:202 utils/dvb/dvbv5-scan.c:149
-#: utils/dvb/dvbv5-zap.c:447
+#: utils/dvb/dvbv5-zap.c:448
msgid "Signal"
msgstr "Signal"
# Carrier/Noise (Signal-/Rausch-Verhältnis)
#: utils/dvb/dvb-fe-tool.c:205 utils/dvb/dvbv5-scan.c:152
-#: utils/dvb/dvbv5-zap.c:450
+#: utils/dvb/dvbv5-zap.c:451
msgid "C/N"
msgstr "S/R"
#: utils/dvb/dvb-fe-tool.c:208 utils/dvb/dvbv5-scan.c:155
-#: utils/dvb/dvbv5-zap.c:453
+#: utils/dvb/dvbv5-zap.c:454
msgid "UCB"
msgstr "UCB (Anzahl unkorrigierter Fehler)"
# BER = Bit-Fehlerrate
#: utils/dvb/dvb-fe-tool.c:211 utils/dvb/dvbv5-scan.c:158
-#: utils/dvb/dvbv5-zap.c:456
+#: utils/dvb/dvbv5-zap.c:457
msgid "postBER"
msgstr "postBER"
#: utils/dvb/dvb-fe-tool.c:214 utils/dvb/dvbv5-scan.c:161
-#: utils/dvb/dvbv5-zap.c:459
+#: utils/dvb/dvbv5-zap.c:460
msgid "preBER"
msgstr "preBER"
#: utils/dvb/dvb-fe-tool.c:217 utils/dvb/dvbv5-scan.c:164
-#: utils/dvb/dvbv5-zap.c:462
+#: utils/dvb/dvbv5-zap.c:463
msgid "PER"
msgstr "PER"
-#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1098
+#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1100
#, c-format
msgid "Connecting to %s:%d\n"
msgstr "Verbinden mit %s:%d\n"
@@ -1835,12 +1835,12 @@
msgid "<initial file>"
msgstr "<Anfangsdatei>"
-#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1084
+#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1086
#, c-format
msgid "Please select one of the LNBf's below:\n"
msgstr "Bitte wählen Sie einen der nachfolgenden LNBfs aus:\n"
-#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1088
+#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1090
#, c-format
msgid "Using LNBf "
msgstr "Verwendet wird LNBf "
@@ -1850,17 +1850,17 @@
msgid "ERROR: Please specify a valid format\n"
msgstr "FEHLER: Bitte geben Sie ein gültiges Format an.\n"
-#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1110
+#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1112
#, c-format
msgid "Couldn't find demux device node\n"
msgstr "Es wurde kein Demultiplexer-Geräteknoten gefunden.\n"
-#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1126
+#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1128
#, c-format
msgid "using demux '%s'\n"
msgstr "Demultiplexer »%s« wird verwendet.\n"
-#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1158
+#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1160
#, c-format
msgid "Failed to set the country code:%s\n"
msgstr "Setzen des Länderkennzeichens fehlgeschlagen:%s\n"
@@ -1976,170 +1976,170 @@
msgid "tuning to %i Hz\n"
msgstr "Einstellen auf %i Hz\n"
-#: utils/dvb/dvbv5-zap.c:565
+#: utils/dvb/dvbv5-zap.c:566
#, fuzzy, c-format
msgid "buffer overrun at %lld\n"
msgstr "Pufferüberlauf\n"
-#: utils/dvb/dvbv5-zap.c:567
+#: utils/dvb/dvbv5-zap.c:568
#, c-format
msgid "buffer overrun after %lld.%02ld seconds\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:592 utils/dvb/dvbv5-zap.c:834
+#: utils/dvb/dvbv5-zap.c:593 utils/dvb/dvbv5-zap.c:835
msgid "Write failed"
msgstr "Schreiben fehlgeschlagen"
-#: utils/dvb/dvbv5-zap.c:600
+#: utils/dvb/dvbv5-zap.c:601
#, c-format
msgid "received %lld bytes (%lld Kbytes/sec)\n"
msgstr "%lld Byte empfangen (%lld Kilobyte/Sek)\n"
-#: utils/dvb/dvbv5-zap.c:603
+#: utils/dvb/dvbv5-zap.c:604
#, c-format
msgid "received %lld bytes\n"
msgstr "%lld Byte empfangen\n"
-#: utils/dvb/dvbv5-zap.c:776 utils/dvb/dvbv5-zap.c:1251
+#: utils/dvb/dvbv5-zap.c:777 utils/dvb/dvbv5-zap.c:1253
#, c-format
msgid "dvb_dev_set_bufsize: buffer set to %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:786
+#: utils/dvb/dvbv5-zap.c:787
#, c-format
msgid " dvb_set_pesfilter to 0x2000\n"
msgstr " dvb_set_pesfilter auf 0x2000\n"
-#: utils/dvb/dvbv5-zap.c:795
+#: utils/dvb/dvbv5-zap.c:796
#, c-format
msgid "Can't get timespec\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:801
+#: utils/dvb/dvbv5-zap.c:802
#, c-format
msgid "%.2fs: Starting capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:813
+#: utils/dvb/dvbv5-zap.c:814
#, c-format
msgid "%.2fs: buffer overrun\n"
msgstr "%.2fs: Pufferüberlauf\n"
-#: utils/dvb/dvbv5-zap.c:816
+#: utils/dvb/dvbv5-zap.c:817
#, fuzzy, c-format
msgid "%.2fs: read() returned error %zd\n"
msgstr "dvbtraffic: read() gab den Fehler %zd zurück\n"
-#: utils/dvb/dvbv5-zap.c:839
+#: utils/dvb/dvbv5-zap.c:840
#, fuzzy, c-format
msgid "%.2fs: only read %zd bytes\n"
msgstr "dvbtraffic: nur %zd Byte gelesen\n"
-#: utils/dvb/dvbv5-zap.c:846
+#: utils/dvb/dvbv5-zap.c:847
#, c-format
msgid "%.2fs: invalid sync byte. Discarding %zd bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:869
+#: utils/dvb/dvbv5-zap.c:870
#, c-format
msgid "%.2fs: invalid pid: 0x%04x\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:896
+#: utils/dvb/dvbv5-zap.c:897
#, c-format
msgid "%.2fs: pid %d has adaption layer, but size is too small!\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:907
+#: utils/dvb/dvbv5-zap.c:908
#, fuzzy, c-format
msgid "%.2fs: pid %d, expecting %d received %d\n"
msgstr "%s: Setzen des Breitbandempfängers %s fehlgeschlagen\n"
-#: utils/dvb/dvbv5-zap.c:952
+#: utils/dvb/dvbv5-zap.c:953
#, fuzzy, c-format
msgid " PID FREQ SPEED TOTAL\n"
msgstr " PID FREQ TEMPO GESAMT\n"
-#: utils/dvb/dvbv5-zap.c:977
+#: utils/dvb/dvbv5-zap.c:978
#, c-format
msgid "OTHER"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1003
+#: utils/dvb/dvbv5-zap.c:1004
#, c-format
msgid "%.2fs: Stopping capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1039
+#: utils/dvb/dvbv5-zap.c:1042
msgid "DVB zap utility"
msgstr "DVB-Umschaltwerkzeug"
-#: utils/dvb/dvbv5-zap.c:1040
+#: utils/dvb/dvbv5-zap.c:1043
msgid "<channel name> [or <frequency> if in monitor mode]"
msgstr "<Kanalname> [oder <Frequenz>, falls im Überwachungsmodus]"
-#: utils/dvb/dvbv5-zap.c:1118
+#: utils/dvb/dvbv5-zap.c:1120
#, c-format
msgid "Couldn't find dvr device node\n"
msgstr "Es wurde kein DVR-Geräteknoten gefunden\n"
-#: utils/dvb/dvbv5-zap.c:1139
+#: utils/dvb/dvbv5-zap.c:1141
#, c-format
msgid "reading channels from file '%s'\n"
msgstr "Kanäle werden aus Datei »%s« gelesen.\n"
-#: utils/dvb/dvbv5-zap.c:1180 utils/dvb/dvbv5-zap.c:1300
-#: utils/dvb/dvbv5-zap.c:1352
+#: utils/dvb/dvbv5-zap.c:1182 utils/dvb/dvbv5-zap.c:1302
+#: utils/dvb/dvbv5-zap.c:1354
#, c-format
msgid "open of '%s' failed"
msgstr "Öffnen von »%s« fehlgeschlagen"
-#: utils/dvb/dvbv5-zap.c:1191
+#: utils/dvb/dvbv5-zap.c:1193
#, c-format
msgid "Service id 0x%04x was not specified at the file\n"
msgstr "Dienstkennung 0x%04x wurde nicht in der Datei angegeben.\n"
-#: utils/dvb/dvbv5-zap.c:1204
+#: utils/dvb/dvbv5-zap.c:1206
#, c-format
msgid "couldn't find pmt-pid for sid %04x\n"
msgstr "PMT-PID für SID %04x konnte nicht gefunden werden.\n"
-#: utils/dvb/dvbv5-zap.c:1238
+#: utils/dvb/dvbv5-zap.c:1240
#, c-format
msgid "pass all PID's to TS\n"
msgstr "reicht alle PIDs an TS weiter.\n"
-#: utils/dvb/dvbv5-zap.c:1240
+#: utils/dvb/dvbv5-zap.c:1242
#, c-format
msgid "video pid %d\n"
msgstr "Video-PID %d\n"
-#: utils/dvb/dvbv5-zap.c:1249 utils/dvb/dvbv5-zap.c:1275
+#: utils/dvb/dvbv5-zap.c:1251 utils/dvb/dvbv5-zap.c:1277
#, c-format
msgid " dvb_set_pesfilter %d\n"
msgstr " dvb_set_pesfilter %d\n"
-#: utils/dvb/dvbv5-zap.c:1268
+#: utils/dvb/dvbv5-zap.c:1270
#, c-format
msgid "audio pid %d\n"
msgstr "Audio-PID %d\n"
-#: utils/dvb/dvbv5-zap.c:1286
+#: utils/dvb/dvbv5-zap.c:1288
#, c-format
msgid "frontend doesn't lock\n"
msgstr "Oberfläche sperrt nicht\n"
-#: utils/dvb/dvbv5-zap.c:1317
+#: utils/dvb/dvbv5-zap.c:1319
#, c-format
msgid "Record to file '%s' started\n"
msgstr "Aufzeichnung in Datei »%s« gestartet\n"
-#: utils/dvb/dvbv5-zap.c:1336
+#: utils/dvb/dvbv5-zap.c:1338
#, c-format
msgid "DVR pipe interface '%s' will be opened\n"
msgstr "DVR-Pipe-Schnittstelle »%s« wird geöffnet.\n"
-#: utils/dvb/dvbv5-zap.c:1360
+#: utils/dvb/dvbv5-zap.c:1362
#, c-format
msgid "DVR interface '%s' can now be opened\n"
msgstr "DVR-Schnittstelle »%s« kann nun geöffnet werden.\n"
diff -Nru v4l-utils-1.16.3/v4l-utils-po/fr.po v4l-utils-1.16.5/v4l-utils-po/fr.po
--- v4l-utils-1.16.3/v4l-utils-po/fr.po 2018-12-15 19:17:28.000000000 +0100
+++ v4l-utils-1.16.5/v4l-utils-po/fr.po 2019-03-28 20:40:18.000000000 +0100
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: v4l-utils 1.8.1\n"
"Report-Msgid-Bugs-To: linux-media@vger.Kernel.org\n"
-"POT-Creation-Date: 2018-12-15 19:17+0100\n"
+"POT-Creation-Date: 2019-03-28 20:40+0100\n"
"PO-Revision-Date: 2015-11-25 05:37+0000\n"
"Last-Translator: Maxim Therrien <acerspyro@gmail.com>\n"
"Language-Team: French\n"
@@ -354,7 +354,7 @@
#: utils/keytable/keytable.c:877 utils/dvb/dvb-fe-tool.c:160
#: utils/dvb/dvb-format-convert.c:88 utils/dvb/dvbv5-scan.c:421
-#: utils/dvb/dvbv5-zap.c:714
+#: utils/dvb/dvbv5-zap.c:715
#, c-format
msgid ""
"\n"
@@ -1488,41 +1488,41 @@
msgstr ""
#: utils/dvb/dvb-fe-tool.c:199 utils/dvb/dvbv5-scan.c:146
-#: utils/dvb/dvbv5-zap.c:444
+#: utils/dvb/dvbv5-zap.c:445
msgid "Quality"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:202 utils/dvb/dvbv5-scan.c:149
-#: utils/dvb/dvbv5-zap.c:447
+#: utils/dvb/dvbv5-zap.c:448
msgid "Signal"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:205 utils/dvb/dvbv5-scan.c:152
-#: utils/dvb/dvbv5-zap.c:450
+#: utils/dvb/dvbv5-zap.c:451
msgid "C/N"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:208 utils/dvb/dvbv5-scan.c:155
-#: utils/dvb/dvbv5-zap.c:453
+#: utils/dvb/dvbv5-zap.c:454
msgid "UCB"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:211 utils/dvb/dvbv5-scan.c:158
-#: utils/dvb/dvbv5-zap.c:456
+#: utils/dvb/dvbv5-zap.c:457
msgid "postBER"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:214 utils/dvb/dvbv5-scan.c:161
-#: utils/dvb/dvbv5-zap.c:459
+#: utils/dvb/dvbv5-zap.c:460
msgid "preBER"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:217 utils/dvb/dvbv5-scan.c:164
-#: utils/dvb/dvbv5-zap.c:462
+#: utils/dvb/dvbv5-zap.c:463
msgid "PER"
msgstr ""
-#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1098
+#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1100
#, c-format
msgid "Connecting to %s:%d\n"
msgstr ""
@@ -1733,12 +1733,12 @@
msgid "<initial file>"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1084
+#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1086
#, c-format
msgid "Please select one of the LNBf's below:\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1088
+#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1090
#, c-format
msgid "Using LNBf "
msgstr ""
@@ -1748,17 +1748,17 @@
msgid "ERROR: Please specify a valid format\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1110
+#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1112
#, fuzzy, c-format
msgid "Couldn't find demux device node\n"
msgstr "Impossible de trouver un noeud à %s%s*.\n"
-#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1126
+#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1128
#, c-format
msgid "using demux '%s'\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1158
+#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1160
#, c-format
msgid "Failed to set the country code:%s\n"
msgstr ""
@@ -1869,170 +1869,170 @@
msgid "tuning to %i Hz\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:565
+#: utils/dvb/dvbv5-zap.c:566
#, c-format
msgid "buffer overrun at %lld\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:567
+#: utils/dvb/dvbv5-zap.c:568
#, c-format
msgid "buffer overrun after %lld.%02ld seconds\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:592 utils/dvb/dvbv5-zap.c:834
+#: utils/dvb/dvbv5-zap.c:593 utils/dvb/dvbv5-zap.c:835
msgid "Write failed"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:600
+#: utils/dvb/dvbv5-zap.c:601
#, c-format
msgid "received %lld bytes (%lld Kbytes/sec)\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:603
+#: utils/dvb/dvbv5-zap.c:604
#, c-format
msgid "received %lld bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:776 utils/dvb/dvbv5-zap.c:1251
+#: utils/dvb/dvbv5-zap.c:777 utils/dvb/dvbv5-zap.c:1253
#, c-format
msgid "dvb_dev_set_bufsize: buffer set to %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:786
+#: utils/dvb/dvbv5-zap.c:787
#, c-format
msgid " dvb_set_pesfilter to 0x2000\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:795
+#: utils/dvb/dvbv5-zap.c:796
#, c-format
msgid "Can't get timespec\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:801
+#: utils/dvb/dvbv5-zap.c:802
#, c-format
msgid "%.2fs: Starting capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:813
+#: utils/dvb/dvbv5-zap.c:814
#, c-format
msgid "%.2fs: buffer overrun\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:816
+#: utils/dvb/dvbv5-zap.c:817
#, c-format
msgid "%.2fs: read() returned error %zd\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:839
+#: utils/dvb/dvbv5-zap.c:840
#, c-format
msgid "%.2fs: only read %zd bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:846
+#: utils/dvb/dvbv5-zap.c:847
#, c-format
msgid "%.2fs: invalid sync byte. Discarding %zd bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:869
+#: utils/dvb/dvbv5-zap.c:870
#, c-format
msgid "%.2fs: invalid pid: 0x%04x\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:896
+#: utils/dvb/dvbv5-zap.c:897
#, c-format
msgid "%.2fs: pid %d has adaption layer, but size is too small!\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:907
+#: utils/dvb/dvbv5-zap.c:908
#, c-format
msgid "%.2fs: pid %d, expecting %d received %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:952
+#: utils/dvb/dvbv5-zap.c:953
#, c-format
msgid " PID FREQ SPEED TOTAL\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:977
+#: utils/dvb/dvbv5-zap.c:978
#, c-format
msgid "OTHER"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1003
+#: utils/dvb/dvbv5-zap.c:1004
#, c-format
msgid "%.2fs: Stopping capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1039
+#: utils/dvb/dvbv5-zap.c:1042
msgid "DVB zap utility"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1040
+#: utils/dvb/dvbv5-zap.c:1043
msgid "<channel name> [or <frequency> if in monitor mode]"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1118
+#: utils/dvb/dvbv5-zap.c:1120
#, fuzzy, c-format
msgid "Couldn't find dvr device node\n"
msgstr "Impossible de trouver un noeud à %s%s*.\n"
-#: utils/dvb/dvbv5-zap.c:1139
+#: utils/dvb/dvbv5-zap.c:1141
#, c-format
msgid "reading channels from file '%s'\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1180 utils/dvb/dvbv5-zap.c:1300
-#: utils/dvb/dvbv5-zap.c:1352
+#: utils/dvb/dvbv5-zap.c:1182 utils/dvb/dvbv5-zap.c:1302
+#: utils/dvb/dvbv5-zap.c:1354
#, c-format
msgid "open of '%s' failed"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1191
+#: utils/dvb/dvbv5-zap.c:1193
#, c-format
msgid "Service id 0x%04x was not specified at the file\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1204
+#: utils/dvb/dvbv5-zap.c:1206
#, c-format
msgid "couldn't find pmt-pid for sid %04x\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1238
+#: utils/dvb/dvbv5-zap.c:1240
#, c-format
msgid "pass all PID's to TS\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1240
+#: utils/dvb/dvbv5-zap.c:1242
#, c-format
msgid "video pid %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1249 utils/dvb/dvbv5-zap.c:1275
+#: utils/dvb/dvbv5-zap.c:1251 utils/dvb/dvbv5-zap.c:1277
#, c-format
msgid " dvb_set_pesfilter %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1268
+#: utils/dvb/dvbv5-zap.c:1270
#, c-format
msgid "audio pid %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1286
+#: utils/dvb/dvbv5-zap.c:1288
#, c-format
msgid "frontend doesn't lock\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1317
+#: utils/dvb/dvbv5-zap.c:1319
#, c-format
msgid "Record to file '%s' started\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1336
+#: utils/dvb/dvbv5-zap.c:1338
#, c-format
msgid "DVR pipe interface '%s' will be opened\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1360
+#: utils/dvb/dvbv5-zap.c:1362
#, c-format
msgid "DVR interface '%s' can now be opened\n"
msgstr ""
Binary files /tmp/mA9XpP6KsI/v4l-utils-1.16.3/v4l-utils-po/pt_BR.gmo and /tmp/qyf9LRyszZ/v4l-utils-1.16.5/v4l-utils-po/pt_BR.gmo differ
diff -Nru v4l-utils-1.16.3/v4l-utils-po/pt_BR.po v4l-utils-1.16.5/v4l-utils-po/pt_BR.po
--- v4l-utils-1.16.3/v4l-utils-po/pt_BR.po 2018-12-15 19:17:28.000000000 +0100
+++ v4l-utils-1.16.5/v4l-utils-po/pt_BR.po 2019-03-28 20:40:18.000000000 +0100
@@ -2,15 +2,15 @@
# Traduções em português brasileiro para o pacote v4l-utils.
# Copyright (C) 2014 Mauro Carvalho Chehab
# This file is distributed under the same license as the v4l-utils package.
-# Mauro Carvalho Chehab <mchehab@osg.samsung.com>, 2014.
+# Mauro Carvalho Chehab <mchehab@kernel.org>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: v4l-utils 1.7.0\n"
"Report-Msgid-Bugs-To: linux-media@vger.Kernel.org\n"
-"POT-Creation-Date: 2018-12-15 19:17+0100\n"
+"POT-Creation-Date: 2019-03-28 20:40+0100\n"
"PO-Revision-Date: 2017-05-06 20:38-0300\n"
-"Last-Translator: Mauro Carvalho Chehab <mchehab@osg.samsung.com>\n"
+"Last-Translator: Mauro Carvalho Chehab <mchehab@kernel.org>\n"
"Language-Team: Brazilian Portuguese\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
@@ -359,7 +359,7 @@
#: utils/keytable/keytable.c:877 utils/dvb/dvb-fe-tool.c:160
#: utils/dvb/dvb-format-convert.c:88 utils/dvb/dvbv5-scan.c:421
-#: utils/dvb/dvbv5-zap.c:714
+#: utils/dvb/dvbv5-zap.c:715
#, c-format
msgid ""
"\n"
@@ -1563,41 +1563,41 @@
msgstr "dvb_fe_get_stats falhou"
#: utils/dvb/dvb-fe-tool.c:199 utils/dvb/dvbv5-scan.c:146
-#: utils/dvb/dvbv5-zap.c:444
+#: utils/dvb/dvbv5-zap.c:445
msgid "Quality"
msgstr "Qualidade"
#: utils/dvb/dvb-fe-tool.c:202 utils/dvb/dvbv5-scan.c:149
-#: utils/dvb/dvbv5-zap.c:447
+#: utils/dvb/dvbv5-zap.c:448
msgid "Signal"
msgstr "Sinal"
#: utils/dvb/dvb-fe-tool.c:205 utils/dvb/dvbv5-scan.c:152
-#: utils/dvb/dvbv5-zap.c:450
+#: utils/dvb/dvbv5-zap.c:451
msgid "C/N"
msgstr "C/N"
#: utils/dvb/dvb-fe-tool.c:208 utils/dvb/dvbv5-scan.c:155
-#: utils/dvb/dvbv5-zap.c:453
+#: utils/dvb/dvbv5-zap.c:454
msgid "UCB"
msgstr "UCB"
#: utils/dvb/dvb-fe-tool.c:211 utils/dvb/dvbv5-scan.c:158
-#: utils/dvb/dvbv5-zap.c:456
+#: utils/dvb/dvbv5-zap.c:457
msgid "postBER"
msgstr "pós-BER"
#: utils/dvb/dvb-fe-tool.c:214 utils/dvb/dvbv5-scan.c:161
-#: utils/dvb/dvbv5-zap.c:459
+#: utils/dvb/dvbv5-zap.c:460
msgid "preBER"
msgstr "preBER"
#: utils/dvb/dvb-fe-tool.c:217 utils/dvb/dvbv5-scan.c:164
-#: utils/dvb/dvbv5-zap.c:462
+#: utils/dvb/dvbv5-zap.c:463
msgid "PER"
msgstr "PER"
-#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1098
+#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1100
#, c-format
msgid "Connecting to %s:%d\n"
msgstr "Conectando a %s:%d\n"
@@ -1813,12 +1813,12 @@
msgid "<initial file>"
msgstr "<arquivo inicial>"
-#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1084
+#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1086
#, c-format
msgid "Please select one of the LNBf's below:\n"
msgstr "Por favor selecione o modelo do LNBf abaixo:\n"
-#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1088
+#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1090
#, c-format
msgid "Using LNBf "
msgstr "Usando LNBf"
@@ -1828,17 +1828,17 @@
msgid "ERROR: Please specify a valid format\n"
msgstr "ERRO: Por favor especifique um formato válido\n"
-#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1110
+#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1112
#, c-format
msgid "Couldn't find demux device node\n"
msgstr "Não foi encontrado nó de dispositivo demux\n"
-#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1126
+#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1128
#, c-format
msgid "using demux '%s'\n"
msgstr "Usando demux '%s'\n"
-#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1158
+#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1160
#, c-format
msgid "Failed to set the country code:%s\n"
msgstr "Falha ao definir o código do país: %s\n"
@@ -1952,170 +1952,170 @@
msgid "tuning to %i Hz\n"
msgstr "sintonizando em %i Hz\n"
-#: utils/dvb/dvbv5-zap.c:565
+#: utils/dvb/dvbv5-zap.c:566
#, fuzzy, c-format
msgid "buffer overrun at %lld\n"
msgstr "buffer esgotado\n"
-#: utils/dvb/dvbv5-zap.c:567
+#: utils/dvb/dvbv5-zap.c:568
#, c-format
msgid "buffer overrun after %lld.%02ld seconds\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:592 utils/dvb/dvbv5-zap.c:834
+#: utils/dvb/dvbv5-zap.c:593 utils/dvb/dvbv5-zap.c:835
msgid "Write failed"
msgstr "Erro na escrita"
-#: utils/dvb/dvbv5-zap.c:600
+#: utils/dvb/dvbv5-zap.c:601
#, c-format
msgid "received %lld bytes (%lld Kbytes/sec)\n"
msgstr "recebidos %lld bytes (%lld Kbytes/seg)\n"
-#: utils/dvb/dvbv5-zap.c:603
+#: utils/dvb/dvbv5-zap.c:604
#, c-format
msgid "received %lld bytes\n"
msgstr "recebidos %lld bytes\n"
-#: utils/dvb/dvbv5-zap.c:776 utils/dvb/dvbv5-zap.c:1251
+#: utils/dvb/dvbv5-zap.c:777 utils/dvb/dvbv5-zap.c:1253
#, c-format
msgid "dvb_dev_set_bufsize: buffer set to %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:786
+#: utils/dvb/dvbv5-zap.c:787
#, c-format
msgid " dvb_set_pesfilter to 0x2000\n"
msgstr " dvb_set_pesfilter configurado para 0x2000\n"
-#: utils/dvb/dvbv5-zap.c:795
+#: utils/dvb/dvbv5-zap.c:796
#, fuzzy, c-format
msgid "Can't get timespec\n"
msgstr "Não consegui sintonizar na frequência"
-#: utils/dvb/dvbv5-zap.c:801
+#: utils/dvb/dvbv5-zap.c:802
#, c-format
msgid "%.2fs: Starting capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:813
+#: utils/dvb/dvbv5-zap.c:814
#, c-format
msgid "%.2fs: buffer overrun\n"
msgstr "%.2fs: buffer esgotado\n"
-#: utils/dvb/dvbv5-zap.c:816
+#: utils/dvb/dvbv5-zap.c:817
#, fuzzy, c-format
msgid "%.2fs: read() returned error %zd\n"
msgstr "dvbtraffic: leitura retornou erro %zd\n"
-#: utils/dvb/dvbv5-zap.c:839
+#: utils/dvb/dvbv5-zap.c:840
#, fuzzy, c-format
msgid "%.2fs: only read %zd bytes\n"
msgstr "dvbtraffic: lidos apenas %zd bytes\n"
-#: utils/dvb/dvbv5-zap.c:846
+#: utils/dvb/dvbv5-zap.c:847
#, c-format
msgid "%.2fs: invalid sync byte. Discarding %zd bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:869
+#: utils/dvb/dvbv5-zap.c:870
#, c-format
msgid "%.2fs: invalid pid: 0x%04x\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:896
+#: utils/dvb/dvbv5-zap.c:897
#, c-format
msgid "%.2fs: pid %d has adaption layer, but size is too small!\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:907
+#: utils/dvb/dvbv5-zap.c:908
#, fuzzy, c-format
msgid "%.2fs: pid %d, expecting %d received %d\n"
msgstr "%s: falha ao configurar receptor de banda larga %s\n"
-#: utils/dvb/dvbv5-zap.c:952
+#: utils/dvb/dvbv5-zap.c:953
#, fuzzy, c-format
msgid " PID FREQ SPEED TOTAL\n"
msgstr " PID FREQ VEL TOTAL\n"
-#: utils/dvb/dvbv5-zap.c:977
+#: utils/dvb/dvbv5-zap.c:978
#, c-format
msgid "OTHER"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1003
+#: utils/dvb/dvbv5-zap.c:1004
#, c-format
msgid "%.2fs: Stopping capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1039
+#: utils/dvb/dvbv5-zap.c:1042
msgid "DVB zap utility"
msgstr "Utilitário para sintonia de TV digital (zap)"
-#: utils/dvb/dvbv5-zap.c:1040
+#: utils/dvb/dvbv5-zap.c:1043
msgid "<channel name> [or <frequency> if in monitor mode]"
msgstr "<nome do channel> [ou <frequência> se em modo de monitoria]"
-#: utils/dvb/dvbv5-zap.c:1118
+#: utils/dvb/dvbv5-zap.c:1120
#, c-format
msgid "Couldn't find dvr device node\n"
msgstr "Não foi encontrado nó de dispositivo dvr\n"
-#: utils/dvb/dvbv5-zap.c:1139
+#: utils/dvb/dvbv5-zap.c:1141
#, c-format
msgid "reading channels from file '%s'\n"
msgstr "lendo canais do arquivo '%s'\n"
-#: utils/dvb/dvbv5-zap.c:1180 utils/dvb/dvbv5-zap.c:1300
-#: utils/dvb/dvbv5-zap.c:1352
+#: utils/dvb/dvbv5-zap.c:1182 utils/dvb/dvbv5-zap.c:1302
+#: utils/dvb/dvbv5-zap.c:1354
#, c-format
msgid "open of '%s' failed"
msgstr "abertura do arquivo '%s' falhou"
-#: utils/dvb/dvbv5-zap.c:1191
+#: utils/dvb/dvbv5-zap.c:1193
#, c-format
msgid "Service id 0x%04x was not specified at the file\n"
msgstr "ID de serviço 0x%04x não está especificado no arquivo\n"
-#: utils/dvb/dvbv5-zap.c:1204
+#: utils/dvb/dvbv5-zap.c:1206
#, c-format
msgid "couldn't find pmt-pid for sid %04x\n"
msgstr "não conseguiu encontrar pmt-pid para SID %04x\n"
-#: utils/dvb/dvbv5-zap.c:1238
+#: utils/dvb/dvbv5-zap.c:1240
#, c-format
msgid "pass all PID's to TS\n"
msgstr "passando todos os packet IDs para o Transport Stream\n"
-#: utils/dvb/dvbv5-zap.c:1240
+#: utils/dvb/dvbv5-zap.c:1242
#, c-format
msgid "video pid %d\n"
msgstr "PID de vídeo %d\n"
-#: utils/dvb/dvbv5-zap.c:1249 utils/dvb/dvbv5-zap.c:1275
+#: utils/dvb/dvbv5-zap.c:1251 utils/dvb/dvbv5-zap.c:1277
#, c-format
msgid " dvb_set_pesfilter %d\n"
msgstr " dvb_set_pesfilter %d\n"
-#: utils/dvb/dvbv5-zap.c:1268
+#: utils/dvb/dvbv5-zap.c:1270
#, c-format
msgid "audio pid %d\n"
msgstr "PID de áudio %d\n"
-#: utils/dvb/dvbv5-zap.c:1286
+#: utils/dvb/dvbv5-zap.c:1288
#, c-format
msgid "frontend doesn't lock\n"
msgstr "frontend não detetou sinal digital\n"
-#: utils/dvb/dvbv5-zap.c:1317
+#: utils/dvb/dvbv5-zap.c:1319
#, c-format
msgid "Record to file '%s' started\n"
msgstr "Gravação iniciada para o arquivo '%s'\n"
-#: utils/dvb/dvbv5-zap.c:1336
+#: utils/dvb/dvbv5-zap.c:1338
#, c-format
msgid "DVR pipe interface '%s' will be opened\n"
msgstr "Interface DVR '%s' será aberta\n"
-#: utils/dvb/dvbv5-zap.c:1360
+#: utils/dvb/dvbv5-zap.c:1362
#, c-format
msgid "DVR interface '%s' can now be opened\n"
msgstr "Interface DVR '%s' pode ser aberta agora\n"
diff -Nru v4l-utils-1.16.3/v4l-utils-po/uk.po v4l-utils-1.16.5/v4l-utils-po/uk.po
--- v4l-utils-1.16.3/v4l-utils-po/uk.po 2018-12-15 19:17:28.000000000 +0100
+++ v4l-utils-1.16.5/v4l-utils-po/uk.po 2019-03-28 20:40:19.000000000 +0100
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: v4l-utils 1.8.1\n"
"Report-Msgid-Bugs-To: linux-media@vger.Kernel.org\n"
-"POT-Creation-Date: 2018-12-15 19:17+0100\n"
+"POT-Creation-Date: 2019-03-28 20:40+0100\n"
"PO-Revision-Date: 2015-12-30 10:00+0000\n"
"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -325,7 +325,7 @@
#: utils/keytable/keytable.c:877 utils/dvb/dvb-fe-tool.c:160
#: utils/dvb/dvb-format-convert.c:88 utils/dvb/dvbv5-scan.c:421
-#: utils/dvb/dvbv5-zap.c:714
+#: utils/dvb/dvbv5-zap.c:715
#, c-format
msgid ""
"\n"
@@ -1455,41 +1455,41 @@
msgstr "помилка dvb_fe_set_parms"
#: utils/dvb/dvb-fe-tool.c:199 utils/dvb/dvbv5-scan.c:146
-#: utils/dvb/dvbv5-zap.c:444
+#: utils/dvb/dvbv5-zap.c:445
msgid "Quality"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:202 utils/dvb/dvbv5-scan.c:149
-#: utils/dvb/dvbv5-zap.c:447
+#: utils/dvb/dvbv5-zap.c:448
msgid "Signal"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:205 utils/dvb/dvbv5-scan.c:152
-#: utils/dvb/dvbv5-zap.c:450
+#: utils/dvb/dvbv5-zap.c:451
msgid "C/N"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:208 utils/dvb/dvbv5-scan.c:155
-#: utils/dvb/dvbv5-zap.c:453
+#: utils/dvb/dvbv5-zap.c:454
msgid "UCB"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:211 utils/dvb/dvbv5-scan.c:158
-#: utils/dvb/dvbv5-zap.c:456
+#: utils/dvb/dvbv5-zap.c:457
msgid "postBER"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:214 utils/dvb/dvbv5-scan.c:161
-#: utils/dvb/dvbv5-zap.c:459
+#: utils/dvb/dvbv5-zap.c:460
msgid "preBER"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:217 utils/dvb/dvbv5-scan.c:164
-#: utils/dvb/dvbv5-zap.c:462
+#: utils/dvb/dvbv5-zap.c:463
msgid "PER"
msgstr ""
-#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1098
+#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1100
#, c-format
msgid "Connecting to %s:%d\n"
msgstr ""
@@ -1701,12 +1701,12 @@
msgid "<initial file>"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1084
+#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1086
#, c-format
msgid "Please select one of the LNBf's below:\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1088
+#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1090
#, c-format
msgid "Using LNBf "
msgstr ""
@@ -1716,17 +1716,17 @@
msgid "ERROR: Please specify a valid format\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1110
+#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1112
#, c-format
msgid "Couldn't find demux device node\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1126
+#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1128
#, c-format
msgid "using demux '%s'\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1158
+#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1160
#, c-format
msgid "Failed to set the country code:%s\n"
msgstr ""
@@ -1837,170 +1837,170 @@
msgid "tuning to %i Hz\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:565
+#: utils/dvb/dvbv5-zap.c:566
#, c-format
msgid "buffer overrun at %lld\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:567
+#: utils/dvb/dvbv5-zap.c:568
#, c-format
msgid "buffer overrun after %lld.%02ld seconds\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:592 utils/dvb/dvbv5-zap.c:834
+#: utils/dvb/dvbv5-zap.c:593 utils/dvb/dvbv5-zap.c:835
msgid "Write failed"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:600
+#: utils/dvb/dvbv5-zap.c:601
#, c-format
msgid "received %lld bytes (%lld Kbytes/sec)\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:603
+#: utils/dvb/dvbv5-zap.c:604
#, c-format
msgid "received %lld bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:776 utils/dvb/dvbv5-zap.c:1251
+#: utils/dvb/dvbv5-zap.c:777 utils/dvb/dvbv5-zap.c:1253
#, c-format
msgid "dvb_dev_set_bufsize: buffer set to %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:786
+#: utils/dvb/dvbv5-zap.c:787
#, c-format
msgid " dvb_set_pesfilter to 0x2000\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:795
+#: utils/dvb/dvbv5-zap.c:796
#, c-format
msgid "Can't get timespec\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:801
+#: utils/dvb/dvbv5-zap.c:802
#, c-format
msgid "%.2fs: Starting capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:813
+#: utils/dvb/dvbv5-zap.c:814
#, c-format
msgid "%.2fs: buffer overrun\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:816
+#: utils/dvb/dvbv5-zap.c:817
#, c-format
msgid "%.2fs: read() returned error %zd\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:839
+#: utils/dvb/dvbv5-zap.c:840
#, c-format
msgid "%.2fs: only read %zd bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:846
+#: utils/dvb/dvbv5-zap.c:847
#, c-format
msgid "%.2fs: invalid sync byte. Discarding %zd bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:869
+#: utils/dvb/dvbv5-zap.c:870
#, c-format
msgid "%.2fs: invalid pid: 0x%04x\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:896
+#: utils/dvb/dvbv5-zap.c:897
#, c-format
msgid "%.2fs: pid %d has adaption layer, but size is too small!\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:907
+#: utils/dvb/dvbv5-zap.c:908
#, c-format
msgid "%.2fs: pid %d, expecting %d received %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:952
+#: utils/dvb/dvbv5-zap.c:953
#, c-format
msgid " PID FREQ SPEED TOTAL\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:977
+#: utils/dvb/dvbv5-zap.c:978
#, c-format
msgid "OTHER"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1003
+#: utils/dvb/dvbv5-zap.c:1004
#, c-format
msgid "%.2fs: Stopping capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1039
+#: utils/dvb/dvbv5-zap.c:1042
msgid "DVB zap utility"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1040
+#: utils/dvb/dvbv5-zap.c:1043
msgid "<channel name> [or <frequency> if in monitor mode]"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1118
+#: utils/dvb/dvbv5-zap.c:1120
#, c-format
msgid "Couldn't find dvr device node\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1139
+#: utils/dvb/dvbv5-zap.c:1141
#, c-format
msgid "reading channels from file '%s'\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1180 utils/dvb/dvbv5-zap.c:1300
-#: utils/dvb/dvbv5-zap.c:1352
+#: utils/dvb/dvbv5-zap.c:1182 utils/dvb/dvbv5-zap.c:1302
+#: utils/dvb/dvbv5-zap.c:1354
#, c-format
msgid "open of '%s' failed"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1191
+#: utils/dvb/dvbv5-zap.c:1193
#, c-format
msgid "Service id 0x%04x was not specified at the file\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1204
+#: utils/dvb/dvbv5-zap.c:1206
#, c-format
msgid "couldn't find pmt-pid for sid %04x\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1238
+#: utils/dvb/dvbv5-zap.c:1240
#, c-format
msgid "pass all PID's to TS\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1240
+#: utils/dvb/dvbv5-zap.c:1242
#, c-format
msgid "video pid %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1249 utils/dvb/dvbv5-zap.c:1275
+#: utils/dvb/dvbv5-zap.c:1251 utils/dvb/dvbv5-zap.c:1277
#, fuzzy, c-format
msgid " dvb_set_pesfilter %d\n"
msgstr "помилка dvb_fe_set_parms"
-#: utils/dvb/dvbv5-zap.c:1268
+#: utils/dvb/dvbv5-zap.c:1270
#, c-format
msgid "audio pid %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1286
+#: utils/dvb/dvbv5-zap.c:1288
#, c-format
msgid "frontend doesn't lock\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1317
+#: utils/dvb/dvbv5-zap.c:1319
#, c-format
msgid "Record to file '%s' started\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1336
+#: utils/dvb/dvbv5-zap.c:1338
#, c-format
msgid "DVR pipe interface '%s' will be opened\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1360
+#: utils/dvb/dvbv5-zap.c:1362
#, c-format
msgid "DVR interface '%s' can now be opened\n"
msgstr ""
diff -Nru v4l-utils-1.16.3/v4l-utils-po/v4l-utils.pot v4l-utils-1.16.5/v4l-utils-po/v4l-utils.pot
--- v4l-utils-1.16.3/v4l-utils-po/v4l-utils.pot 2018-12-15 19:17:28.000000000 +0100
+++ v4l-utils-1.16.5/v4l-utils-po/v4l-utils.pot 2019-03-28 20:40:18.000000000 +0100
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: v4l-utils 1.16.3\n"
+"Project-Id-Version: v4l-utils 1.16.5\n"
"Report-Msgid-Bugs-To: linux-media@vger.Kernel.org\n"
-"POT-Creation-Date: 2018-12-15 19:17+0100\n"
+"POT-Creation-Date: 2019-03-28 20:40+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"
@@ -322,7 +322,7 @@
#: utils/keytable/keytable.c:877 utils/dvb/dvb-fe-tool.c:160
#: utils/dvb/dvb-format-convert.c:88 utils/dvb/dvbv5-scan.c:421
-#: utils/dvb/dvbv5-zap.c:714
+#: utils/dvb/dvbv5-zap.c:715
#, c-format
msgid ""
"\n"
@@ -1449,41 +1449,41 @@
msgstr ""
#: utils/dvb/dvb-fe-tool.c:199 utils/dvb/dvbv5-scan.c:146
-#: utils/dvb/dvbv5-zap.c:444
+#: utils/dvb/dvbv5-zap.c:445
msgid "Quality"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:202 utils/dvb/dvbv5-scan.c:149
-#: utils/dvb/dvbv5-zap.c:447
+#: utils/dvb/dvbv5-zap.c:448
msgid "Signal"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:205 utils/dvb/dvbv5-scan.c:152
-#: utils/dvb/dvbv5-zap.c:450
+#: utils/dvb/dvbv5-zap.c:451
msgid "C/N"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:208 utils/dvb/dvbv5-scan.c:155
-#: utils/dvb/dvbv5-zap.c:453
+#: utils/dvb/dvbv5-zap.c:454
msgid "UCB"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:211 utils/dvb/dvbv5-scan.c:158
-#: utils/dvb/dvbv5-zap.c:456
+#: utils/dvb/dvbv5-zap.c:457
msgid "postBER"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:214 utils/dvb/dvbv5-scan.c:161
-#: utils/dvb/dvbv5-zap.c:459
+#: utils/dvb/dvbv5-zap.c:460
msgid "preBER"
msgstr ""
#: utils/dvb/dvb-fe-tool.c:217 utils/dvb/dvbv5-scan.c:164
-#: utils/dvb/dvbv5-zap.c:462
+#: utils/dvb/dvbv5-zap.c:463
msgid "PER"
msgstr ""
-#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1098
+#: utils/dvb/dvb-fe-tool.c:346 utils/dvb/dvbv5-zap.c:1100
#, c-format
msgid "Connecting to %s:%d\n"
msgstr ""
@@ -1693,12 +1693,12 @@
msgid "<initial file>"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1084
+#: utils/dvb/dvbv5-scan.c:496 utils/dvb/dvbv5-zap.c:1086
#, c-format
msgid "Please select one of the LNBf's below:\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1088
+#: utils/dvb/dvbv5-scan.c:500 utils/dvb/dvbv5-zap.c:1090
#, c-format
msgid "Using LNBf "
msgstr ""
@@ -1708,17 +1708,17 @@
msgid "ERROR: Please specify a valid format\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1110
+#: utils/dvb/dvbv5-scan.c:529 utils/dvb/dvbv5-zap.c:1112
#, c-format
msgid "Couldn't find demux device node\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1126
+#: utils/dvb/dvbv5-scan.c:536 utils/dvb/dvbv5-zap.c:1128
#, c-format
msgid "using demux '%s'\n"
msgstr ""
-#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1158
+#: utils/dvb/dvbv5-scan.c:556 utils/dvb/dvbv5-zap.c:1160
#, c-format
msgid "Failed to set the country code:%s\n"
msgstr ""
@@ -1829,170 +1829,170 @@
msgid "tuning to %i Hz\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:565
+#: utils/dvb/dvbv5-zap.c:566
#, c-format
msgid "buffer overrun at %lld\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:567
+#: utils/dvb/dvbv5-zap.c:568
#, c-format
msgid "buffer overrun after %lld.%02ld seconds\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:592 utils/dvb/dvbv5-zap.c:834
+#: utils/dvb/dvbv5-zap.c:593 utils/dvb/dvbv5-zap.c:835
msgid "Write failed"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:600
+#: utils/dvb/dvbv5-zap.c:601
#, c-format
msgid "received %lld bytes (%lld Kbytes/sec)\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:603
+#: utils/dvb/dvbv5-zap.c:604
#, c-format
msgid "received %lld bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:776 utils/dvb/dvbv5-zap.c:1251
+#: utils/dvb/dvbv5-zap.c:777 utils/dvb/dvbv5-zap.c:1253
#, c-format
msgid "dvb_dev_set_bufsize: buffer set to %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:786
+#: utils/dvb/dvbv5-zap.c:787
#, c-format
msgid " dvb_set_pesfilter to 0x2000\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:795
+#: utils/dvb/dvbv5-zap.c:796
#, c-format
msgid "Can't get timespec\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:801
+#: utils/dvb/dvbv5-zap.c:802
#, c-format
msgid "%.2fs: Starting capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:813
+#: utils/dvb/dvbv5-zap.c:814
#, c-format
msgid "%.2fs: buffer overrun\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:816
+#: utils/dvb/dvbv5-zap.c:817
#, c-format
msgid "%.2fs: read() returned error %zd\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:839
+#: utils/dvb/dvbv5-zap.c:840
#, c-format
msgid "%.2fs: only read %zd bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:846
+#: utils/dvb/dvbv5-zap.c:847
#, c-format
msgid "%.2fs: invalid sync byte. Discarding %zd bytes\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:869
+#: utils/dvb/dvbv5-zap.c:870
#, c-format
msgid "%.2fs: invalid pid: 0x%04x\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:896
+#: utils/dvb/dvbv5-zap.c:897
#, c-format
msgid "%.2fs: pid %d has adaption layer, but size is too small!\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:907
+#: utils/dvb/dvbv5-zap.c:908
#, c-format
msgid "%.2fs: pid %d, expecting %d received %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:952
+#: utils/dvb/dvbv5-zap.c:953
#, c-format
msgid " PID FREQ SPEED TOTAL\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:977
+#: utils/dvb/dvbv5-zap.c:978
#, c-format
msgid "OTHER"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1003
+#: utils/dvb/dvbv5-zap.c:1004
#, c-format
msgid "%.2fs: Stopping capture\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1039
+#: utils/dvb/dvbv5-zap.c:1042
msgid "DVB zap utility"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1040
+#: utils/dvb/dvbv5-zap.c:1043
msgid "<channel name> [or <frequency> if in monitor mode]"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1118
+#: utils/dvb/dvbv5-zap.c:1120
#, c-format
msgid "Couldn't find dvr device node\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1139
+#: utils/dvb/dvbv5-zap.c:1141
#, c-format
msgid "reading channels from file '%s'\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1180 utils/dvb/dvbv5-zap.c:1300
-#: utils/dvb/dvbv5-zap.c:1352
+#: utils/dvb/dvbv5-zap.c:1182 utils/dvb/dvbv5-zap.c:1302
+#: utils/dvb/dvbv5-zap.c:1354
#, c-format
msgid "open of '%s' failed"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1191
+#: utils/dvb/dvbv5-zap.c:1193
#, c-format
msgid "Service id 0x%04x was not specified at the file\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1204
+#: utils/dvb/dvbv5-zap.c:1206
#, c-format
msgid "couldn't find pmt-pid for sid %04x\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1238
+#: utils/dvb/dvbv5-zap.c:1240
#, c-format
msgid "pass all PID's to TS\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1240
+#: utils/dvb/dvbv5-zap.c:1242
#, c-format
msgid "video pid %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1249 utils/dvb/dvbv5-zap.c:1275
+#: utils/dvb/dvbv5-zap.c:1251 utils/dvb/dvbv5-zap.c:1277
#, c-format
msgid " dvb_set_pesfilter %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1268
+#: utils/dvb/dvbv5-zap.c:1270
#, c-format
msgid "audio pid %d\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1286
+#: utils/dvb/dvbv5-zap.c:1288
#, c-format
msgid "frontend doesn't lock\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1317
+#: utils/dvb/dvbv5-zap.c:1319
#, c-format
msgid "Record to file '%s' started\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1336
+#: utils/dvb/dvbv5-zap.c:1338
#, c-format
msgid "DVR pipe interface '%s' will be opened\n"
msgstr ""
-#: utils/dvb/dvbv5-zap.c:1360
+#: utils/dvb/dvbv5-zap.c:1362
#, c-format
msgid "DVR interface '%s' can now be opened\n"
msgstr ""
diff -Nru v4l-utils-1.16.3/v4l-utils.spec.in v4l-utils-1.16.5/v4l-utils.spec.in
--- v4l-utils-1.16.3/v4l-utils.spec.in 2018-11-09 14:11:35.000000000 +0100
+++ v4l-utils-1.16.5/v4l-utils.spec.in 2019-03-28 20:36:33.000000000 +0100
@@ -198,5 +198,5 @@
%changelog
-* Thr Oct 06 2011 Mauro Carvalho Chehab <mchehab@redhat.com> 0.9.0-test
+* Thr Oct 06 2011 Mauro Carvalho Chehab <mchehab@kernel.org> 0.9.0-test
- Initial v4l-utils.spec file
Reply to: