Request 267 (accepted)

Overview

Request 267 (accepted)

Update to ver 1.6.1, does not build for 11.4 anymore.

Created by zaitor over 11 years ago
In state accepted

Submit guvcview

Submit package home:zaitor:branches:Essentials / guvcview to package Essentials / guvcview

guvcview.changes Changed

guvcview.spec Changed

guvcview-src-1.5.3.tar.gz/aclocal.m4 Deleted

@@ -1,1597 +0,0 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef(AC_AUTOCONF_VERSION,
-  m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.68,,
-m4_warning(this file was generated for autoconf 2.68.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.))
-
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
-#
-# Modified to never use included libintl. 
-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version 
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen <mclasen@redhat.com> 08/06/2004
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't 
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy(AC_DEFUN,glib_DEFUN)
-m4_copy(AC_REQUIRE,glib_REQUIRE)
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN(GLIB_LC_MESSAGES,
-  AC_CHECK_HEADERS(locale.h)
-    if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK(for LC_MESSAGES, am_cv_val_LC_MESSAGES,
-      AC_TRY_LINK(#include <locale.h>, return LC_MESSAGES,
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no))
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        Define if your <locale.h> file defines LC_MESSAGES.)
-    fi
-  fi)
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM , VALUE-IF-NOT-FOUND , PATH)
-glib_DEFUN(GLIB_PATH_PROG_WITH_TEST,
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=$2
-AC_MSG_CHECKING(for $ac_word)
-AC_CACHE_VAL(ac_cv_path_$1,
-case "$$1" in
-  /*)
-  ac_cv_path_$1="$$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse($5, , $PATH, $5); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if $3; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse($4, , ,   test -z "$ac_cv_path_$1" && ac_cv_path_$1="$4"
-)dnl
-  ;;
-esac)dnl
-$1="$ac_cv_path_$1"
-if test ifelse($4, , -n "$$1", "$$1" != "$4"); then
-  AC_MSG_RESULT($$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-)
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN(GLIB_WITH_NLS,
-  dnl NLS is obligatory
-  USE_NLS=yes
-    AC_SUBST(USE_NLS)
-
-    gt_cv_have_gettext=no
-
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
-
-    AC_CHECK_HEADER(libintl.h,
-     gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
-
-      #
-      # First check in libc
-      #
-      AC_CACHE_CHECK(for ngettext in libc, gt_cv_func_ngettext_libc,
-        AC_TRY_LINK(
-#include <libintl.h>
-,
-         return !ngettext ("","", 1),
-	  gt_cv_func_ngettext_libc=yes,
-          gt_cv_func_ngettext_libc=no)
-        )
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      AC_CACHE_CHECK(for dgettext in libc, gt_cv_func_dgettext_libc,
-        	AC_TRY_LINK(
-#include <libintl.h>
-,
-	          return !dgettext ("",""),
-		  gt_cv_func_dgettext_libc=yes,
-	          gt_cv_func_dgettext_libc=no)
-        	)
-      fi
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-        AC_CHECK_FUNCS(bind_textdomain_codeset)
-      fi
-
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-	 || test "$gt_cv_func_ngettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-        
-        AC_CHECK_LIB(intl, bindtextdomain,
-	    AC_CHECK_LIB(intl, ngettext,
-		    AC_CHECK_LIB(intl, dgettext,
-			          gt_cv_func_dgettext_libintl=yes)))
-
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  AC_MSG_CHECKING(if -liconv is needed to use gettext)
-	  AC_MSG_RESULT()
-  	  AC_CHECK_LIB(intl, ngettext,
-          	AC_CHECK_LIB(intl, dcgettext,
-		       gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv,
-			:,-liconv),
-		:,-liconv)
-        fi
-
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext and ngettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          AC_CHECK_FUNCS(bind_textdomain_codeset)
-          LIBS="$glib_save_LIBS"
-
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes" \
-		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
-
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
-  
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
-  
-      if test "$gt_cv_have_gettext" = "yes"; then
-	AC_DEFINE(HAVE_GETTEXT,1,
-	  Define if the GNU gettext() function is already present or preinstalled.)
-	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`", no)dnl
-	if test "$MSGFMT" != "no"; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS $INTLLIBS"
-	  AC_CHECK_FUNCS(dcgettext)
-	  MSGFMT_OPTS=
-	  AC_MSG_CHECKING(if msgfmt accepts -c)
-	  GLIB_RUN_PROG($MSGFMT -c -o /dev/null,
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: test 1.0\n"
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-"Last-Translator: test <foo@bar.xx>\n"
-"Language-Team: C <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-, MSGFMT_OPTS=-c; AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
-	  AC_SUBST(MSGFMT_OPTS)
-	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	    test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`", :)
-	  AC_TRY_LINK(, extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr,
-	    CATOBJEXT=.gmo 
-             DATADIRNAME=share,
-	    case $host in
-	    *-*-solaris*)
-	    dnl On Solaris, if bind_textdomain_codeset is in libc,
-	    dnl GNU format message catalog is always supported,
-            dnl since both are added to the libc all together.
-	    dnl Hence, we'd like to go with DATADIRNAME=share and
-	    dnl and CATOBJEXT=.gmo in this case.
-            AC_CHECK_FUNC(bind_textdomain_codeset,
-	      CATOBJEXT=.gmo 
-               DATADIRNAME=share,
-	      CATOBJEXT=.mo
-               DATADIRNAME=lib)
-	    ;;
-	    *)
-	    CATOBJEXT=.mo
-            DATADIRNAME=lib
-	    ;;
-	    esac)
-          LIBS="$glib_save_LIBS"
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-    )
-
-    if test "$gt_cv_have_gettext" = "yes" ; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        always defined to indicate that i18n is enabled)
-    fi
-
-    dnl Test whether we really found GNU xgettext.
-    if test "$XGETTEXT" != ":"; then
-      dnl If it is not GNU xgettext we define it as : so that the
-      dnl Makefiles still can work.
-      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        AC_MSG_RESULT(
-	  found xgettext program is not GNU xgettext; ignore it)
-        XGETTEXT=":"
-      fi
-    fi
-
-    # We need to process the po/ directory.
-    POSUB=po
-
-    AC_OUTPUT_COMMANDS(
-      case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac)
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.ac.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(PO_IN_DATADIR_TRUE)
-    AC_SUBST(PO_IN_DATADIR_FALSE)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  )
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation 
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by 
-# glib-gettextize.
-dnl
-glib_DEFUN(GLIB_GNU_GETTEXT,
-  AC_REQUIRE(AC_PROG_CC)dnl
-   AC_REQUIRE(AC_HEADER_STDC)dnl
-   
-   GLIB_LC_MESSAGES
-   GLIB_WITH_NLS
-
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/$.*$ \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  )
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN(GLIB_DEFINE_LOCALEDIR,
-glib_REQUIRE(GLIB_GNU_GETTEXT)dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
-  localedir=`eval echo "${libdir}/locale"`
-else
-  localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-AC_DEFINE_UNQUOTED($1, "$localedir",
-  Define the location where the catalogs will be installed)
-)
-
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_ac,,
-AC_DEFUN(AM_GLIB_GNU_GETTEXT,GLIB_GNU_GETTEXT($@))
-AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,GLIB_DEFINE_LOCALEDIR($@))
-)dnl
-
-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, ACTION-IF-PASS, ACTION-IF-FAIL)
-# 
-# Create a temporary file with TEST-FILE as its contents and pass the
-# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
-# 0 and perform ACTION-IF-FAIL for any other exit status.
-AC_DEFUN(GLIB_RUN_PROG,
-cat >conftest.foo <<_ACEOF
-$2
-_ACEOF
-if AC_RUN_LOG($1 conftest.foo); then
-  m4_ifval($3, $3, :)
-m4_ifvaln($4, else $4)dnl
-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi)
-
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# 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; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG(MIN-VERSION)
-# ----------------------------------
-AC_DEFUN(PKG_PROG_PKG_CONFIG,
-m4_pattern_forbid(^_?PKG_A-Z_+$)
-m4_pattern_allow(^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$)
-m4_pattern_allow(^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$)
-AC_ARG_VAR(PKG_CONFIG, path to pkg-config utility)
-AC_ARG_VAR(PKG_CONFIG_PATH, directories to add to pkg-config's search path)
-AC_ARG_VAR(PKG_CONFIG_LIBDIR, path overriding pkg-config's built-in search path)
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL(PKG_CONFIG, pkg-config)
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default($1, 0.9.0)
-	AC_MSG_CHECKING(pkg-config is at least version $_pkg_min_version)
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-		PKG_CONFIG=""
-	fi
-fidnl
-)# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN(PKG_CHECK_EXISTS,
-AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG($PKG_CONFIG --exists --print-errors "$1"); then
-  m4_default($2, :)
-m4_ifvaln($3, else
-  $3)dnl
-fi)
-
-# _PKG_CONFIG(VARIABLE, COMMAND, MODULES)
-# ---------------------------------------------
-m4_define(_PKG_CONFIG,
-if test -n "$$1"; then
-    pkg_cv_$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS($3,
-                     pkg_cv_$1=`$PKG_CONFIG --$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ,
-		     pkg_failed=yes)
- else
-    pkg_failed=untried
-fidnl
-)# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN(_PKG_SHORT_ERRORS_SUPPORTED,
-AC_REQUIRE(PKG_PROG_PKG_CONFIG)
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fidnl
-)# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
-# ACTION-IF-NOT-FOUND)
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN(PKG_CHECK_MODULES,
-AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
-AC_ARG_VAR($1_CFLAGS, C compiler flags for $1, overriding pkg-config)dnl
-AC_ARG_VAR($1_LIBS, linker flags for $1, overriding pkg-config)dnl
-
-pkg_failed=no
-AC_MSG_CHECKING(for $1)
-
-_PKG_CONFIG($1_CFLAGS, cflags, $2)
-_PKG_CONFIG($1_LIBS, libs, $2)
-
-m4_define(_PKG_TEXT, Alternatively, you may set the environment variables $1_CFLAGS
-and $1_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.)
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT(no)
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default($4, AC_MSG_ERROR(
-Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT)dnl
-        )
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT(no)
-	m4_default($4, AC_MSG_FAILURE(
-The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.)dnl
-        )
-else
-	$1_CFLAGS=$pkg_cv_$1_CFLAGS
-	$1_LIBS=$pkg_cv_$1_LIBS
-        AC_MSG_RESULT(yes)
-	$3
-fidnl
-)# PKG_CHECK_MODULES
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN(AM_AUTOMAKE_VERSION,
-am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.11.1, ,
-      AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
-)
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define(_AM_AUTOCONF_VERSION, )
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.11.1)dnl
-m4_ifndef(AC_AUTOCONF_VERSION,
-  m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-_AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*$.*$"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN(AM_AUX_DIR_EXPAND,
-dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ(2.50)dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-)
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN(AM_CONDITIONAL,
-AC_PREREQ(2.52)dnl
- ifelse($1, TRUE,  AC_FATAL($0: invalid condition: $1),
-	$1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
-AC_SUBST($1_TRUE)dnl
-AC_SUBST($1_FALSE)dnl
-_AM_SUBST_NOTMAKE($1_TRUE)dnl
-_AM_SUBST_NOTMAKE($1_FALSE)dnl
-m4_define(_AM_COND_VALUE_$1, $2)dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR(conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.)
-fi))
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 10
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN(_AM_DEPENDENCIES,
-AC_REQUIRE(AM_SET_DEPDIR)dnl
-AC_REQUIRE(AM_OUTPUT_DEPENDENCY_COMMANDS)dnl
-AC_REQUIRE(AM_MAKE_INCLUDE)dnl
-AC_REQUIRE(AM_DEP_TRACK)dnl
-
-ifelse($1, CC,   depcc="$CC"   am_compiler_list=,
-       $1, CXX,  depcc="$CXX"  am_compiler_list=,
-       $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
-       $1, UPC,  depcc="$UPC"  am_compiler_list=,
-       $1, GCJ,  depcc="$GCJ"  am_compiler_list='gcc3 gcc',
-                   depcc="$$1"   am_compiler_list=)
-
-AC_CACHE_CHECK(dependency style of $depcc,
-               am_cv_$1_dependencies_compiler_type,
-if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  m4_case($1, CC,
-    case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac,
-    CXX,
-    case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac)
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-)
-AC_SUBST($1DEPMODE, depmode=$am_cv_$1_dependencies_compiler_type)
-AM_CONDITIONAL(am__fastdep$1, 
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3)
-)
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN(AM_SET_DEPDIR,
-AC_REQUIRE(AM_SET_LEADING_DOT)dnl
-AC_SUBST(DEPDIR, "${am__leading_dot}deps")dnl
-)
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN(AM_DEP_TRACK,
-AC_ARG_ENABLE(dependency-tracking,
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors)
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
-AC_SUBST(AMDEPBACKSLASH)dnl
-_AM_SUBST_NOTMAKE(AMDEPBACKSLASH)dnl
-)
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN(_AM_OUTPUT_DEPENDENCY_COMMANDS,
-{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME("$file")`
-      AS_MKDIR_P($dirpart/$fdir)
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-)# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,
-AC_CONFIG_COMMANDS(depfiles,
-     test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS,
-     AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir")
-)
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN(AM_CONFIG_HEADER, AC_CONFIG_HEADERS($@))
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 16
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, NO-DEFINE)
-# AM_INIT_AUTOMAKE(OPTIONS)
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN(AM_INIT_AUTOMAKE,
-AC_PREREQ(2.62)dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow(^AM_A-Z+FLAGS$)dnl
-AC_REQUIRE(AM_SET_CURRENT_AUTOMAKE_VERSION)dnl
-AC_REQUIRE(AC_PROG_INSTALL)dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST(am__isrc, ' -I$(srcdir)')_AM_SUBST_NOTMAKE(am__isrc)dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR(source directory already configured; run "make distclean" there first)
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST(CYGPATH_W)
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval($2,
-m4_ifval($3, _AM_SET_OPTION(no-define))dnl
- AC_SUBST(PACKAGE, $1)dnl
- AC_SUBST(VERSION, $2),
-_AM_SET_OPTIONS($1)dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef(AC_PACKAGE_NAME, 1)m4_ifdef(AC_PACKAGE_VERSION, 1), 11,,
-  m4_fatal(AC_INIT should be called with package and version arguments))dnl
- AC_SUBST(PACKAGE, 'AC_PACKAGE_TARNAME')dnl
- AC_SUBST(VERSION, 'AC_PACKAGE_VERSION'))dnl
-
-_AM_IF_OPTION(no-define,,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", Name of package)
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", Version number of package))dnl
-
-# Some tools Automake needs.
-AC_REQUIRE(AM_SANITY_CHECK)dnl
-AC_REQUIRE(AC_ARG_PROGRAM)dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
-AC_REQUIRE(AM_PROG_INSTALL_STRIP)dnl
-AC_REQUIRE(AM_PROG_MKDIR_P)dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE(AC_PROG_AWK)dnl
-AC_REQUIRE(AC_PROG_MAKE_SET)dnl
-AC_REQUIRE(AM_SET_LEADING_DOT)dnl
-_AM_IF_OPTION(tar-ustar, _AM_PROG_TAR(ustar),
-	      _AM_IF_OPTION(tar-pax, _AM_PROG_TAR(pax),
-			     _AM_PROG_TAR(v7)))
-_AM_IF_OPTION(no-dependencies,,
-AC_PROVIDE_IFELSE(AC_PROG_CC,
-		  _AM_DEPENDENCIES(CC),
-		  define(AC_PROG_CC,
-			  defn(AC_PROG_CC)_AM_DEPENDENCIES(CC)))dnl
-AC_PROVIDE_IFELSE(AC_PROG_CXX,
-		  _AM_DEPENDENCIES(CXX),
-		  define(AC_PROG_CXX,
-			  defn(AC_PROG_CXX)_AM_DEPENDENCIES(CXX)))dnl
-AC_PROVIDE_IFELSE(AC_PROG_OBJC,
-		  _AM_DEPENDENCIES(OBJC),
-		  define(AC_PROG_OBJC,
-			  defn(AC_PROG_OBJC)_AM_DEPENDENCIES(OBJC)))dnl
-)
-_AM_IF_OPTION(silent-rules, AC_REQUIRE(AM_SILENT_RULES))dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-m4_provide_if(_AM_COMPILER_EXEEXT,
-  AM_CONDITIONAL(am__EXEEXT, test -n "$EXEEXT")))dnl
-)
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define(_AC_COMPILER_EXEEXT,
-m4_defn(_AC_COMPILER_EXEEXT)m4_provide(_AM_COMPILER_EXEEXT))
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN(_AC_AM_CONFIG_HEADER_HOOK,
-# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
-
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN(AM_PROG_INSTALL_SH,
-AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST(install_sh))
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN(AM_SET_LEADING_DOT,
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST(am__leading_dot))
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MAINTAINER_MODE(DEFAULT-MODE)
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN(AM_MAINTAINER_MODE,
-m4_case(m4_default($1, disable),
-       enable, m4_define(am_maintainer_other, disable),
-       disable, m4_define(am_maintainer_other, enable),
-       m4_define(am_maintainer_other, enable)
-        m4_warn(syntax, unexpected argument to AM@&t@_MAINTAINER_MODE: $1))
-AC_MSG_CHECKING(whether to am_maintainer_other maintainer-specific portions of Makefiles)
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE(maintainer-mode,
-  --am_maintainer_other-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer,
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=m4_if(am_maintainer_other, enable, no, yes))
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-
-)
-
-AU_DEFUN(jm_MAINTAINER_MODE, AM_MAINTAINER_MODE)
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN(AM_MAKE_INCLUDE,
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING(for style of include used by $am_make)
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
-rm -f confinc confmf
-)
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN(AM_MISSING_PROG,
-AC_REQUIRE(AM_MISSING_HAS_RUN)
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1))
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN(AM_MISSING_HAS_RUN,
-AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
-AC_REQUIRE_AUX_FILE(missing)dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN(`missing' script is too old or missing)
-fi
-)
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN(AM_PROG_MKDIR_P,
-AC_PREREQ(2.60)dnl
-AC_REQUIRE(AC_PROG_MKDIR_P)dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST(mkdir_p, "$MKDIR_P")dnl
-case $mkdir_p in
-  \\/$* | ?:\\/*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-)
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN(_AM_MANGLE_OPTION,
-_AM_OPTION_m4_bpatsubst($1, ^a-zA-Z0-9_, _))
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN(_AM_SET_OPTION,
-m4_define(_AM_MANGLE_OPTION($1), 1))
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN(_AM_SET_OPTIONS,
-m4_foreach_w(_AM_Option, $1, _AM_SET_OPTION(_AM_Option)))
-
-# _AM_IF_OPTION(OPTION, IF-SET, IF-NOT-SET)
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN(_AM_IF_OPTION,
-m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN(AM_SANITY_CHECK,
-AC_MSG_CHECKING(whether build environment is sane)
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *\\\"\#\$\&\'\`$am_lf*)
-    AC_MSG_ERROR(unsafe absolute working directory name);;
-esac
-case $srcdir in
-  *\\\"\#\$\&\'\`$am_lf\ \	*)
-    AC_MSG_ERROR(unsafe srcdir value: `$srcdir');;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR(ls -t appears to fail.  Make sure there is not a broken
-alias in your environment)
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR(newly created file is older than distributed files!
-Check your system clock)
-fi
-AC_MSG_RESULT(yes))
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN(AM_PROG_INSTALL_STRIP,
-AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL(STRIP, strip, :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST(INSTALL_STRIP_PROGRAM))
-
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN(_AM_SUBST_NOTMAKE)
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN(AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($@))
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN(_AM_PROG_TAR,
-# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG(AMTAR, tar)
-m4_if($1, v7,
-     am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -',
-     m4_case($1, ustar,, pax,,
-              m4_fatal(Unknown tar format))
-AC_MSG_CHECKING(how to create a $1 tar archive)
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if($1, ustar, plaintar) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG($_am_tar --version) && break
-    done
-    am__tar="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG(tardir=conftest.dir && eval $am__tar_ >conftest.tar)
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG($am__untar <conftest.tar)
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL(am_cv_prog_tar_$1, am_cv_prog_tar_$1=$_am_tool)
-AC_MSG_RESULT($am_cv_prog_tar_$1))
-AC_SUBST(am__tar)
-AC_SUBST(am__untar)
-) # _AM_PROG_TAR
-
-m4_include(m4/acx_pthread.m4)

guvcview-src-1.5.3.tar.gz/debian Deleted

guvcview-src-1.5.3.tar.gz/debian/README.Debian Deleted

guvcview-src-1.5.3.tar.gz/debian/changelog Deleted

@@ -1,453 +0,0 @@
-guvcview (1.5.3-ubuntu1~oneiric~ppa1) oneiric; urgency=low
-
-    * update libavcodec API
-    * add libavutil dependency
-    
- -- Paulo Assis <pj.assis@gmail.com>  Sat, 11 Feb 2011 14:27:00 +0000
-  
-guvcview (1.5.2-ubuntu1~oneiric~ppa1) oneiric; urgency=low
-
-    * move to pthreads (fix gthread API 2 issues)
-    * add italian translation
-    * fix several libavcodec issues
-    * fix some gtk3 widgets
-    * update standards version to 3.9.2
-    
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 12 Oct 2011 12:12:00 +0000
-
-guvcview (1.5.1-ubuntu3~oneiric~ppa1) oneiric; urgency=low
-
-    * move to gtk3
-    * make control window size dependent on screen resolution
-    * Threaded coding patch George Sedov <radist.morse@gmail.com>
-    * fix h264 codec properties
-    
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 12 Oct 2011 12:12:00 +0000
-
-guvcview (1.5.0-ubuntu1~natty~ppa1) natty; urgency=low
-
-    * update standards version to 3.9.1
-    * add a no display mode (--no_display)
-    * fix build issues with newer versions (>=0.7.x) of ffmpeg libavcodec
-    * add support for unix signals
-    * add VU meter OSD
-    * fix menu controls (linux 3.0)
-    
- -- Paulo Assis <pj.assis@gmail.com>  Tue, 9 Apr 2011 22:16:00 +0000
- 
-guvcview (1.4.5-ubuntu1~maverick~ppa1) maverick; urgency=low
-
-    * store current codec properties in configuration file
-    * fix audio codec properties button
-    * modify some logitech extra controls (integer to menu)
-
- -- Paulo Assis <pj.assis@gmail.com>  Tue, 1 Mar 2011 23:09:00 +0000
-
-guvcview (1.4.4-ubuntu1~maverick~ppa1) maverick; urgency=low
-
-    * add av_sync patch by Richard Fuchs <dfx@dfx.at>:
-        Fixes sync issues between audio and video 
-        (most noticeable in avi container due to lack of timestamps)
-    * Apply matroska-largefiles patch by Richard Fuchs <dfx@dfx.at>:
-        Fix large files indexing in 32 bit systems
-    * fix logitech disable video processing mode
-
- -- Paulo Assis <pj.assis@gmail.com>  Mon, 10 Jan 2011 15:05:00 +0000
-
-guvcview (1.4.3-ubuntu1~maverick~ppa1) maverick; urgency=low
-
-   * Fix control enumeration for buggy cameras (endless loop on failed control query)
-   * Add udev events support (new dependy libudev)
-   * Add exit on close to image capture
-   * Fix image capture autonaming when set from command line
-
- -- Paulo Assis <pj.assis@gmail.com>  Sun, 06 Nov 2010 11:00:00 +0000
-
-guvcview (1.4.2-ubuntu1~lucid~ppa1) lucid; urgency=low
-
-   * Add support for Y16 pixel format (Greyscale)
-   * Fix dynamic control support under kernels > 2.6.35
-   * Check if resolution is supported by SDL_Surface
-   * Check for null overlays
-   * Use a sanner video ring buffer size (dependent on fps)
-   * Add gdk-pixbuf-2.0 to pkg-config dependencies - fix build error on Maverick 
-
- -- Paulo Assis <pj.assis@gmail.com>  Sat, 25 Sept 2010 14:45:00 +0000
-
-guvcview (1.4.1-ubuntu1~lucid~ppa1) lucid; urgency=low
-
-   * Fix h264 defaults
-   * Fix dynamic control mappings (uncache dynamic ctrls in uvc driver)
-   * check for valid ranges on integer controls
-   * Add uvcdynctrl to Recommends
-
- -- Paulo Assis <pj.assis@gmail.com>  Mon, 14 Jun 2010 23:24:00 +0000
- 
-guvcview (1.4.0-ubuntu1~lucid~ppa1) lucid; urgency=low
-
-   * completly refactor v4l control interface
-   * change to control profile file format - rfc 0.0.2
-   * change icon set, use Paul Davey <mattahan@gmail.com> icons: 
-        http://mattahan.deviantart.com/
-
- -- Paulo Assis <pj.assis@gmail.com>  Tue, 8 Jun 2010 10:18:00 +0000
-
-guvcview (1.3.1-ubuntu2~karmic~ppa1) karmic; urgency=low
-   * Add support for GDK events
-   * Add support for Webcam photo button
-   * Add raw image format to command line picture timed capture
-
- -- Paulo Assis <pj.assis@gmail.com>  Sat, 10 Apr 2010 22:23:00 +0000
-
-guvcview (1.3.0-ubuntu1~karmic~ppa1) karmic; urgency=low
-
-   * Use libv4l2 for device access
-   * Fix several builtin software autofocus issues
-
- -- Paulo Assis <pj.assis@gmail.com>  Sat, 6 Mar 2010 19:58:00 +0000
-
-guvcview (1.2.2-ubuntu1~karmic~ppa1) karmic; urgency=low
-
-   * Drop Twolame dependency
-   * Audio enconding through libavcodec
-   * Add MP3, AC3 and AAC(needs ffmpeg extra from medibuntu repo) support
-
- -- Paulo Assis <pj.assis@gmail.com>  Sat, 30 Jan 2010 13:08:00 +0000
-
-guvcview (1.2.1-ubuntu1~karmic~ppa1) karmic; urgency=low
-
-   * Performance boost:
-    - Use ring buffers for video and audio processing.
-    - Moved video and audio processing (including file IO) to separate thread.
-   * Add particles video effect.
-   * Fixed bug caused by empty device list.
-   * Add MPG4-AVC (H264) codec support.
-   * Package renamed to avoid future conflict with universe repo.   
-
- -- Paulo Assis <pj.assis@gmail.com>  Mon, 16 Nov 2009 10:25:00 +0000
-
-guvcview (1.2.0-ubuntu1) karmic; urgency=low
-
-   * Resolution and input format change no longer need a restart
-   * Add "add_ctrls" option - exits after adding extension controls
-   * Add disk check during capture (checks free space every 10sec)
-   * Stop capture if low on free disk space
-   * Add xioctl funtion - failed ioctl will be retried 4 times in case of I/O error
-   * Fixed invalid gtk-button-images property warning   
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 13 Oct 2009 11:30:00 +0000
-
-guvcview (1.1.4-ubuntu1) karmic; urgency=low
-
-   * Set pixel format BA81 to correct fourcc
-   * Definitve fix button images display under karmic
-   * Add pix formats: nv12, nv21, nv16, nv61, y41p, grey, s501, s505, s508
-   * Improve yu12 and yv12 format conversion.
-   * Changed package dependencies to new ffmpeg naming (use ffmpeg-extra)
-   * Add skip initial frames option
-   * Fix man pages
-   * Add hebrew language support
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 19 Sep 2009 21:59:00 +0000
-
-guvcview (1.1.3-ubuntu1) jaunty; urgency=low
-
-   * Add rgb24 and bgr24 color formats
-   * Set pulse support disabled by default in configure
-   * Add extra messages to configure
-   * Fix button images display under gtk 2.17
-
- -- Paulo Assis <pj.assis@gmail.com>  Thu, 20 Aug 2009 13:50:00 +0000
-
-guvcview (1.1.2-ubuntu1) jaunty; urgency=low
-
-   * Fixed YUYV Matroska codec segfault
-   * Added enable-debug option to configure (debug symbols (-g) is now disable by default)
-   * Added Dutch translation
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 13 Aug 2009 12:59:00 +0000
-
-guvcview (1.1.1-ubuntu1) jaunty; urgency=low
-
-   * Fixed Ubuntu 9.10 exit segfault
-   * Added disable-pulse option to configure
-   * Added russian translation by Roustam Ghizdatov
-   * Added patches 2763, 2764 and 2765 by iwamatsu
-   * Fixed some video format conversions
-   * Fixed memory allocations when in control_only mode
-
- -- Paulo Assis <pj.assis@gmail.com>  Sun, 31 May 2009 10:16:00 +0000
-
-guvcview (1.1.0-ubuntu1) jaunty; urgency=low
-
-   * Added Matroska file format support (mkv)
-   * Fixed Ubuntu 9.10 audio capture
-   * Added initial pulseaudio support (testing only - needs pulse-devel for enabling)
-   * Added libavcodec-unstripped to recommend (enables mpeg2 and mpeg4 video codecs)
-   
- -- Paulo Assis <pj.assis@gmail.com>  Sun, 10 May 2009 14:26:00 +0000
-
-guvcview (1.0.5-ubuntu1) intrepid; urgency=low
-
-   * Added libavcodec properties button 
-   * Improved default options for libavcodec
-   * Improved support for libavcodec
-   
- -- Paulo Assis <pj.assis@gmail.com>  Sat, 4 Apr 2009 14:00:00 +0000
-
-guvcview (1.0.4-ubuntu1) intrepid; urgency=low
-
-   * Added WMV1 encoding to avi capture 
-   * fixed libavcodec configuration
-   * changed support for uyvy (now we convert it to yuyv and use only one render format)
-   * changed raw bayer conversion funtions
-   * added full bayer support ( all bayer pixel formats)
-   
- -- Paulo Assis <pj.assis@gmail.com>  Sun, 29 Mar 2009 22:32:00 +0000
-
-guvcview (1.0.2-ubuntu1) intrepid; urgency=low
-
-   * Fixed segfault on gspca devices 
-
- -- Paulo Assis <pj.assis@gmail.com>  Sun, 8 Mar 2009 09:58:00 +0000
-
-guvcview (1.0.1-ubuntu3) intrepid; urgency=low
-
-   * Fixed giant bug that prevented format detection 
-
- -- Paulo Assis <pj.assis@gmail.com>  Mon, 4 Mar 2009 23:57:00 +0000
-
-guvcview (1.0.0-ubuntu2) intrepid; urgency=low
-
-   * Fixed vid:pid for UVC driver dynamic controls 
-   * Fixed yu12 conversion bug (needs testing)
-   * added yv12 frame format (needs testing)
-   * added yvyu frame format (needs testing)
-   * Fixed null devices list bug (segfault)
-   * Added version option to console args (--version)
-
- -- Paulo Assis <pj.assis@gmail.com>  Mon, 2 Mar 2009 14:43:00 +0000
-
-guvcview (0.9.9) intrepid; urgency=low
-
-   * Fixed Format detection bug
-   * Added control only functionality (--control_only), allows image control in different apps (e.g ekiga, mplayer)
-   * Splitted V4l2 interface in smaller files
-
-guvcview (0.9.8) intrepid; urgency=low
-
-   * Added audio tab
-   * Added new icon theme
-   * Added audio effects
-   * Added Turkish, Danish and Czech catalogs
-   * Fixed Debian/armel corruption bug.(fix by Rask Ingemann Lambertsen)
-   * Fixed gdk display bug after avi capture auto split (when max length reached), make gdk thread safe.
-   * fixed empty device list segfault bug
-   
- -- Paulo Assis <pj.assis@gmail.com>  Sat, 28 Jan 2009 09:43:00 +0000
-
-guvcview (0.9.7) unstable; urgency=low
-
-   * Added JPEG pixel format support.
-   * Added YYUV pixel format support.
-   * Change configuration parsing method, using GScanner (glib).
-   * Change console options parsing method, using GOption (glib).
-   * Change string handling, using glib functions.
-   * Change memory managment, using glib functions.
-   * Change from pthreads to gthreads (glib).
-   * Added multiple device support.
-   
- -- Paulo Assis <pj.assis@gmail.com>  Tue, 31 Dec 2008 12:16:00 +0000
-
-guvcview (0.9.6) stable; urgency=low
-
-   * Fixed Get Focus value for logitech motor focus cameras.
-   * Added select with timeout so guvcview won't stall at VIDIOC_DQBUFF.
-   * Added support for GBRG pix format.
-   * Added initial support for drivers that don't enumerate frame sizes (gspca).
-   * Change console options parsing method, we now use getopt.
-   * Improved v4l2 error handling by providing more usefull error messages.
-   
- -- Paulo Assis <pj.assis@gmail.com>  Sat, 6 Dec 2008 18:44:00 +0000
-
-guvcview (0.9.5) stable; urgency=low
-
-   * Fixed several warnings in valgrind.
-   * Fixed a couple of memory leaks.
-   * Fixed a device open/close bug after first format init failure, causing 
-    second init with a valid format to fail. 
-   
- -- Paulo Assis <pj.assis@gmail.com>  Fri, 7 Nov 2008 23:19:00 +0000
-
-guvcview (0.9.4) stable; urgency=low
-
-   * Added support for isight camera - UYVY (Nobuhiro Iwamatsu).
-   * Added support for YU12 ( YUV 4:2:0 planar) pixel format.
-   * Changed audio capture from blocking API to callback API,
-	should improve audio performance.
-   * Improved software autofocus (Dr. Alexander K. Seewald)
-   * Added MP2 audio compression (twolame)
-   * Added AVI auto file naming
-   * Added AVI multi file captures (captures bigger than max file size)
-
- -- Paulo Assis <pj.assis@gmail.com>  Mon, 13 Oct 2008 18:48:00 +0000
-
-guvcview (0.9.3) stable; urgency=low
-
-   * Fixed buffer overflow in filename extension for autocapture.
-   * Fixed Doc installation path
-   * Added software autofocus control for quickcam cameras (beta)
-   * Changed avi audio method (audio chunks are now written directly to avi file)
-   * Added avi max file size limit to config file
-   * Close avi safely and stop capture when max file size reached
-   * Fixed compilationwith 2.6.26 kernels
-   
- -- Paulo Assis <pj.assis@gmail.com>  Mon, 18 Aug 2008 23:25:00 +0000
-
-
-guvcview (0.9.2) stable; urgency=low
-
-   * Fixed German Translation by Andreas Volz <andreas@tux-style.de>.
-   * Fixed Jpg Save error on Cameras with incomplete JFIF headers
-   
- -- Paulo Assis <pj.assis@gmail.com>  Mon, 21 Jul 2008 23:30:00 +0000
-
-
-guvcview (0.9.1) stable; urgency=low
-
-   * Added error message dialogs.
-   * Changed cleanup.
-   * Added translations for error messages.
-   * Fixed Pan/Tilt for Sphere/Orbit (should now work with latest libwebcam)
-   * Changed icon set
-   * Added guvcview icon to control window
-   * Improved Raw support (needs patch for uvc driver,  http://forums.quickcamteam.net/showthread.php?tid=323)
-   
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 11 Jul 2008 12:04:00 +0000
-
-
-guvcview (0.9.0) stable; urgency=low
-
-   * GUI change: Add Tab Container.
-   * Add spin button to integer controls (allows fine tunning).
-   * Add gettext support (i18n).
-   * Add laguage catalogs (pt pt_PT pt_BR fr de).
-   * Add button icons.
-   * Changed build scripts, make will now build guvcview.desktop and make install will install all data files.
-   
- -- Paulo Assis <pj.assis@gmail.com>  Mon, 18 May 2008 10:20:00 +0000
- 
-guvcview (0.8.2) stable; urgency=low
-
-   * Fixed SegFault after soundthread exit in 64 bit systems (bug: #013688)
-   * Moved all SDL related stuff to video thread
-   * Add support for long name command line args
-   
- -- Paulo Assis <pj.assis@gmail.com>  Fri, 02 May 2008 19:18:00 +0000
-
-
-guvcview (0.8.1) stable; urgency=low
-
-   * Fixed Debian Testing (lenny) image file name icrement bug.
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 19 Apr 2008 22:25:18 +0000
-
-guvcview (0.8.0) stable; urgency=low
-
-   * Fixed Pan/Tilt and Focus Control
-   * Added Scrolled Pans to GUI
-   * Added image autonaming and auto capture.
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000
-
-guvcview (0.7.4) stable; urgency=low
-
-   * Added File Auto name checkbox
-   * Added File increment label
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000
-
-guvcview (0.7.3) stable; urgency=low
-
-   * Added file name increment for multiple captures
-   * Added timed capture mode
-   * Fixed Pan/Tilt controls
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000
-
-guvcview (0.7.1) stable; urgency=low
-
-   * Fixed Backlight Compensation
-   * Added Dynamic Controls
-   * Added video loop sleep time to rc file
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000
-
-guvcview (0.7.0) stable; urgency=low
-
-   * Fixed Cell padding (auto resize widgets)
-   * Fixed Mono filter
-   * Added quit button
-   * Added sound capture parameters to rc file
-   * Added device string to rc file
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000
-
-guvcview (0.6.2) stable; urgency=low
-
-   * Replace '~' by home dir in Path entry
-   * added fps counter command line option '-p'
-   * added input mode combo box (jpg - yuv)
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000
-
-guvcview (0.6.1) stable; urgency=low
-
-   * fixed memory allocation bug for jpeg encoder buffer
-   * added video filters to rc file
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000
-
-guvcview (0.6.0) unstable; urgency=low
-
-   * Added image filters
-   * Added built-in jpeg encoder (allows jpeg and MJPG compression with
-     filters and in yuv mode)
-   * Changed Exposure settings to comboBox (compatibility with V4L2)
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000
-
-guvcview (0.5.4) unstable; urgency=low
-
-  * Adds -t seconds and -n filename.avi command line options - timer used
-    with -n will capture filename.avi for specified number of seconds
-  * Stores avi and sound options to rc file. The options will be remembered in
-    the next session.
-  * Moved global variables to global structure. Allows bether cleanup.
-  * Increased audio input buffer - will avoid droping frames in the begining
-    of capture in slower machines.
-  * Improved sync system for video-audio.
-  * Cleanup of some non-used variables.
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000
-
-guvcview (0.5.2-1) unstable; urgency=low
-
-  * fixes a restart bug when guvcview is started from system path
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000
-
-guvcview (0.5.1-0) unstable; urgency=low
-
-  * disables sound and avi compression controls when in avi capture
-  * some bug fixing for sound capture.
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000
-
-guvcview (0.5.0-beta) unstable; urgency=low
-
-  * Adds basic sound support to AVI capture
-  * AVI video set by default to MJPG
-
-
- -- Paulo Assis <pj.assis@gmail.com>  Wed, 09 Jan 2008 19:07:18 +0000

guvcview-src-1.5.3.tar.gz/debian/compat Deleted

guvcview-src-1.5.3.tar.gz/debian/control Deleted

guvcview-src-1.5.3.tar.gz/debian/copyright Deleted

guvcview-src-1.5.3.tar.gz/debian/dirs Deleted

guvcview-src-1.5.3.tar.gz/debian/docs Deleted

guvcview-src-1.5.3.tar.gz/debian/guvcview.dirs Deleted

guvcview-src-1.5.3.tar.gz/debian/guvcview.install Deleted

guvcview-src-1.5.3.tar.gz/debian/guvcview.postinst Deleted

@@ -1,43 +0,0 @@
-#!/bin/sh
-# postinst script for guvcview
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-	if test -x /usr/bin/update-menus; then update-menus; fi
-	if test -x /usr/bin/update-desktop-database; then update-desktop-database -q; fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

guvcview-src-1.5.3.tar.gz/debian/guvcview.postrm Deleted

@@ -1,41 +0,0 @@
-#!/bin/sh
-# postrm script for guvcview
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-	if test -x /usr/bin/update-menus; then update-menus; fi
-	if test -x /usr/bin/update-desktop-database; then update-desktop-database -q; fi
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

guvcview-src-1.5.3.tar.gz/debian/guvcview.substvars Deleted

guvcview-src-1.5.3.tar.gz/debian/patches Deleted

guvcview-src-1.5.3.tar.gz/debian/patches/series Deleted

guvcview-src-1.5.3.tar.gz/debian/rules Deleted

guvcview-src-1.5.3.tar.gz/m4/acx_pthread.m4 Deleted

@@ -1,243 +0,0 @@
-dnl @synopsis ACX_PTHREAD(ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl
-dnl @summary figure out how to build C programs using POSIX threads
-dnl
-dnl This macro figures out how to build C programs using POSIX threads.
-dnl It sets the PTHREAD_LIBS output variable to the threads library and
-dnl linker flags, and the PTHREAD_CFLAGS output variable to any special
-dnl C compiler flags that are needed. (The user can also force certain
-dnl compiler flags/libs to be tested by setting these environment
-dnl variables.)
-dnl
-dnl Also sets PTHREAD_CC to any special C compiler that is needed for
-dnl multi-threaded programs (defaults to the value of CC otherwise).
-dnl (This is necessary on AIX to use the special cc_r compiler alias.)
-dnl
-dnl NOTE: You are assumed to not only compile your program with these
-dnl flags, but also link it with them as well. e.g. you should link
-dnl with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
-dnl $LIBS
-dnl
-dnl If you are only building threads programs, you may wish to use
-dnl these variables in your default LIBS, CFLAGS, and CC:
-dnl
-dnl        LIBS="$PTHREAD_LIBS $LIBS"
-dnl        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-dnl        CC="$PTHREAD_CC"
-dnl
-dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
-dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
-dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-dnl
-dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
-dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
-dnl default action will define HAVE_PTHREAD.
-dnl
-dnl Please let the authors know if this macro fails on any platform, or
-dnl if you have any other suggestions or comments. This macro was based
-dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with
-dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros
-dnl posted by Alejandro Forero Cuervo to the autoconf macro repository.
-dnl We are also grateful for the helpful feedback of numerous users.
-dnl
-dnl @category InstalledPackages
-dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
-dnl @version 2006-05-29
-dnl @license GPLWithACException
-
-AC_DEFUN(ACX_PTHREAD, 
-AC_REQUIRE(AC_CANONICAL_HOST)
-AC_LANG_SAVE
-AC_LANG_C
-acx_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING(for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS)
-        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test x"$acx_pthread_ok" = xno; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads -lthread, but it
-#      doesn't hurt to check since this sometimes defines pthreads too;
-#      also defines -D_REENTRANT)
-#      ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case "${host_cpu}-${host_os}" in
-        *solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-        # a function called by this macro, so we could check for that, but
-        # who knows whether they'll stub that too in a future libc.)  So,
-        # we'll just look for -pthreads and -lpthread first:
-
-        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
-        ;;
-esac
-
-if test x"$acx_pthread_ok" = xno; then
-for flag in $acx_pthread_flags; do
-
-        case $flag in
-                none)
-                AC_MSG_CHECKING(whether pthreads work without any flags)
-                ;;
-
-                -*)
-                AC_MSG_CHECKING(whether pthreads work with $flag)
-                PTHREAD_CFLAGS="$flag"
-                ;;
-
-		pthread-config)
-		AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
-		if test x"$acx_pthread_config" = xno; then continue; fi
-		PTHREAD_CFLAGS="`pthread-config --cflags`"
-		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-		;;
-
-                *)
-                AC_MSG_CHECKING(for the pthreads library -l$flag)
-                PTHREAD_LIBS="-l$flag"
-                ;;
-        esac
-
-        save_LIBS="$LIBS"
-        save_CFLAGS="$CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-        AC_TRY_LINK(#include <pthread.h>,
-                    pthread_t th; pthread_join(th, 0);
-                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ,
-                    acx_pthread_ok=yes)
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test "x$acx_pthread_ok" = xyes; then
-                break;
-        fi
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$acx_pthread_ok" = xyes; then
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-	AC_MSG_CHECKING(for joinable pthread attribute)
-	attr_name=unknown
-	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-	    AC_TRY_LINK(#include <pthread.h>, int attr=$attr; return attr;,
-                        attr_name=$attr; break)
-	done
-        AC_MSG_RESULT($attr_name)
-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
-                               Define to necessary symbol if this constant
-                                uses a non-standard name on your system.)
-        fi
-
-        AC_MSG_CHECKING(if more special flags are required for pthreads)
-        flag=no
-        case "${host_cpu}-${host_os}" in
-            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
-            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
-        esac
-        AC_MSG_RESULT(${flag})
-        if test "x$flag" != xno; then
-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-        fi
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        # More AIX lossage: must compile with xlc_r or cc_r
-	if test x"$GCC" != xyes; then
-          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
-        else
-          PTHREAD_CC=$CC
-	fi
-else
-        PTHREAD_CC="$CC"
-fi
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CFLAGS)
-AC_SUBST(PTHREAD_CC)
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_pthread_ok" = xyes; then
-        ifelse($1,,AC_DEFINE(HAVE_PTHREAD,1,Define if you have POSIX threads libraries and header files.),$1)
-        :
-else
-        acx_pthread_ok=no
-        $2
-fi
-AC_LANG_RESTORE
-)dnl ACX_PTHREAD
-

guvcview-src-1.5.3.tar.gz/pixmaps Deleted

guvcview-src-1.5.3.tar.gz/pixmaps/Makefile.am Deleted

@@ -1,84 +0,0 @@
-#copies backup files if regular data files not found
-
-pixs = \
-	guvcview.png\
-	camera.png\
-	movie.png\
-	save.png\
-	defaults.png\
-	image_controls.png\
-	video_controls.png\
-	audio_controls.png\
-	images_folder.png\
-	videos_folder.png\
-	controls_folder.png\
-	close.png
-
-CONFIG_CLEAN_FILES = guvcview *.desktop* guvcview.1_ guvcview.1.gz guvcview.menu
-
-clean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-.manpage:
-	if test -e guvcview.1; then\
-		echo "compressing man page";\
-		cp guvcview.1 guvcview.1_;\
-		gzip guvcview.1;\
-		cp guvcview.1_ guvcview.1;\
-	else\
-		echo "could not find man page";\
-	fi
-
-if DEBIAN_MENU
-.menu:
-		if test -e guvcview; then\
-			echo "guvcview debian menu file exists";\
-		else\
-			echo "Creating debian menu file";\
-			rm -f guvcview.menu;\
-			touch guvcview.menu;\
-			echo "?package(guvcview):\\" >> guvcview.menu;\
-			echo "	needs=\"X11\"\\" >> guvcview.menu;\
-			echo "	section=\"Applications/Video\"\\" >> guvcview.menu;\
-			echo "	title=\"guvcview\"\\" >> guvcview.menu;\
-			echo "	longtitle=\"GTK UVC Viewer - uvc video viewer and capturer\"\\" >> guvcview.menu;\
-			echo "	command=\"guvcview\"\\" >> guvcview.menu;\
-			echo "	icon=\"$(datadir)/pixmaps/guvcview/guvcview.png\"" >> guvcview.menu;\
-			cp guvcview.menu guvcview;\
-		fi
-endif
-
-if DESKTOP
-.desktop:
-	if test -e guvcview.desktop; then\
-		echo "guvcview.desktop exists";\
-	else\
-		echo "creating guvcview.desktop";\
-		rm -f guvcview.desktop_;\
-		touch guvcview.desktop_;\
-		echo "Desktop Entry" >> guvcview.desktop_;\
-		echo "Version=1.0" >> guvcview.desktop_;\
-		echo "Name=guvcview" >> guvcview.desktop_;\
-		echo "GenericName=GTK UVC video viewer" >> guvcview.desktop_;\
-		echo "Comment=A video viewer and capturer for the linux uvc driver" >> guvcview.desktop_;\
-		echo "TryExec=guvcview" >> guvcview.desktop_;\
-		echo "Exec=guvcview" >> guvcview.desktop_;\
-		echo "Icon=$(datadir)/pixmaps/guvcview/guvcview.png" >> guvcview.desktop_;\
-		echo "Terminal=false" >> guvcview.desktop_;\
-		echo "Type=Application" >> guvcview.desktop_;\
-		echo "Categories=Video;AudioVideo;" >> guvcview.desktop_;\
-		echo "StartupNotify=true" >> guvcview.desktop_;\
-		cp guvcview.desktop_ guvcview.desktop;\
-	fi
-endif
-
-.png:
-	for file in ${pixs}; do \
-		if test -e $$file; then \
-			echo "$$file exists";\
-		else\
-			echo "ERROR: $$file not found!";\
-		fi;\
-	done
-
-.PHONY: .menu .desktop .png .manpage

guvcview-src-1.5.3.tar.gz/pixmaps/Makefile.in Deleted

@@ -1,430 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#copies backup files if regular data files not found
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = pixmaps
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPS_CFLAGS = @DEPS_CFLAGS@
-DEPS_LIBS = @DEPS_LIBS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-PULSE_CFLAGS = @PULSE_CFLAGS@
-PULSE_LIBS = @PULSE_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-acx_pthread_config = @acx_pthread_config@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-pixs = \
-	guvcview.png\
-	camera.png\
-	movie.png\
-	save.png\
-	defaults.png\
-	image_controls.png\
-	video_controls.png\
-	audio_controls.png\
-	images_folder.png\
-	videos_folder.png\
-	controls_folder.png\
-	close.png
-
-CONFIG_CLEAN_FILES = guvcview *.desktop* guvcview.1_ guvcview.1.gz guvcview.menu
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pixmaps/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu pixmaps/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
-
-
-clean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-.manpage:
-	if test -e guvcview.1; then\
-		echo "compressing man page";\
-		cp guvcview.1 guvcview.1_;\
-		gzip guvcview.1;\
-		cp guvcview.1_ guvcview.1;\
-	else\
-		echo "could not find man page";\
-	fi
-
-@DEBIAN_MENU_TRUE@.menu:
-@DEBIAN_MENU_TRUE@		if test -e guvcview; then\
-@DEBIAN_MENU_TRUE@			echo "guvcview debian menu file exists";\
-@DEBIAN_MENU_TRUE@		else\
-@DEBIAN_MENU_TRUE@			echo "Creating debian menu file";\
-@DEBIAN_MENU_TRUE@			rm -f guvcview.menu;\
-@DEBIAN_MENU_TRUE@			touch guvcview.menu;\
-@DEBIAN_MENU_TRUE@			echo "?package(guvcview):\\" >> guvcview.menu;\
-@DEBIAN_MENU_TRUE@			echo "	needs=\"X11\"\\" >> guvcview.menu;\
-@DEBIAN_MENU_TRUE@			echo "	section=\"Applications/Video\"\\" >> guvcview.menu;\
-@DEBIAN_MENU_TRUE@			echo "	title=\"guvcview\"\\" >> guvcview.menu;\
-@DEBIAN_MENU_TRUE@			echo "	longtitle=\"GTK UVC Viewer - uvc video viewer and capturer\"\\" >> guvcview.menu;\
-@DEBIAN_MENU_TRUE@			echo "	command=\"guvcview\"\\" >> guvcview.menu;\
-@DEBIAN_MENU_TRUE@			echo "	icon=\"$(datadir)/pixmaps/guvcview/guvcview.png\"" >> guvcview.menu;\
-@DEBIAN_MENU_TRUE@			cp guvcview.menu guvcview;\
-@DEBIAN_MENU_TRUE@		fi
-
-@DESKTOP_TRUE@.desktop:
-@DESKTOP_TRUE@	if test -e guvcview.desktop; then\
-@DESKTOP_TRUE@		echo "guvcview.desktop exists";\
-@DESKTOP_TRUE@	else\
-@DESKTOP_TRUE@		echo "creating guvcview.desktop";\
-@DESKTOP_TRUE@		rm -f guvcview.desktop_;\
-@DESKTOP_TRUE@		touch guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "Desktop Entry" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "Version=1.0" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "Name=guvcview" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "GenericName=GTK UVC video viewer" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "Comment=A video viewer and capturer for the linux uvc driver" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "TryExec=guvcview" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "Exec=guvcview" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "Icon=$(datadir)/pixmaps/guvcview/guvcview.png" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "Terminal=false" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "Type=Application" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "Categories=Video;AudioVideo;" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		echo "StartupNotify=true" >> guvcview.desktop_;\
-@DESKTOP_TRUE@		cp guvcview.desktop_ guvcview.desktop;\
-@DESKTOP_TRUE@	fi
-
-.png:
-	for file in ${pixs}; do \
-		if test -e $$file; then \
-			echo "$$file exists";\
-		else\
-			echo "ERROR: $$file not found!";\
-		fi;\
-	done
-
-.PHONY: .menu .desktop .png .manpage
-
-# Tell versions 3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

guvcview-src-1.5.3.tar.gz/sdl.pc Deleted

guvcview-src-1.5.3.tar.gz/src/pulse_audio_c.bak Deleted

@@ -1,271 +0,0 @@
-/*******************************************************************************#
-#           guvcview              http://guvcview.sourceforge.net               #
-#                                                                               #
-#           Paulo Assis <pj.assis@gmail.com>                                    #
-#                                                                               #
-# 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; either version 2 of the License, or             #
-# (at your option) any later version.                                           #
-#                                                                               #
-# This program is distributed in the hope that it will be useful,               #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of                #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 #
-# GNU General Public License for more details.                                  #
-#                                                                               #
-# You should have received a copy of the GNU General Public License             #
-# along with this program; if not, write to the Free Software                   #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA     #
-#                                                                               #
-********************************************************************************/
-#include "../config.h"
-
-#ifdef PULSEAUDIO
-
-#include <pulse/pulseaudio.h>
-#include <pulse/ext-device-restore.h>
-
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <string.h>
-#include "audio_effects.h"
-#include "ms_time.h"
-
-#include <errno.h>
-
-#define __AMUTEX &pdata->mutex
-
-#define pa_assert(expr)                                              \
-    do {                                                                \
-        if (!(expr)) {                                     \
-            g_printerr("Assertion '%s' failed at %s:%u, function (). Aborting.", #expr , __FILE__, __LINE__); \
-            abort();                                                    \
-        }                                                               \
-    } while (FALSE)
-
-static pa_context *context = NULL;
-static pa_mainloop_api *mainloop_api = NULL;
-static pa_proplist *proplist = NULL;
-static gboolean nl = FALSE;
-static int actions = 1;
-
-static const char *pa_strnull(const char *x) {
-    return x ? x : "(null)";
-}
-
-static const char *pa_yes_no(gboolean b) {
-    return b ? "yes" : "no";
-}
-
-static void quit(int ret) 
-{
-    pa_assert(mainloop_api);
-    mainloop_api->quit(mainloop_api, ret);
-}
-
-static void context_drain_complete(pa_context *c, void *userdata) {
-    pa_context_disconnect(c);
-}
-
-static void drain(void) {
-    pa_operation *o;
-
-    if (!(o = pa_context_drain(context, context_drain_complete, NULL)))
-        pa_context_disconnect(context);
-    else
-        pa_operation_unref(o);
-}
-
-static void complete_action(void) {
-    pa_assert(actions > 0);
-
-    if (!(--actions))
-        drain();
-    
-    
-}
-
-
-
-static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info *i, int is_last, void *userdata) 
-{
-    char t32, k32, sPA_SAMPLE_SPEC_SNPRINT_MAX;
-    char cvPA_CVOLUME_SNPRINT_MAX, cvdbPA_SW_CVOLUME_SNPRINT_DB_MAX;
-    char cmPA_CHANNEL_MAP_SNPRINT_MAX, fPA_FORMAT_INFO_SNPRINT_MAX;
-    char *pl;
-
-    if (is_last < 0) {
-      	g_print("Failed to get sink input information: %s", pa_strerror(pa_context_errno(c)));
-        quit(1);
-        return;
-    }
-
-    if (is_last) {
-    	g_print("last sink\n");
-        complete_action();
-        return;
-    }
-
-    pa_assert(i);
-
-    if (nl)
-        printf("\n");
-    nl = TRUE;
-
-    g_snprintf(t, sizeof(t), "%u", i->owner_module);
-    g_snprintf(k, sizeof(k), "%u", i->client);
-
-    g_print("Sink Input #%u\n"
-             "\tDriver: %s\n"
-             "\tOwner Module: %s\n"
-             "\tClient: %s\n"
-             "\tSink: %u\n"
-             "\tSample Specification: %s\n"
-             "\tChannel Map: %s\n"
-             "\tFormat: %s\n"
-             "\tMute: %s\n"
-             "\tVolume: %s\n"
-             "\t        %s\n"
-             "\t        balance %0.2f\n"
-             "\tBuffer Latency: %0.0f usec\n"
-             "\tSink Latency: %0.0f usec\n"
-             "\tResample method: %s\n"
-             "\tProperties:\n\t\t%s\n",
-           i->index,
-           pa_strnull(i->driver),
-           i->owner_module != PA_INVALID_INDEX ? t : "n/a",
-           i->client != PA_INVALID_INDEX ? k : "n/a",
-           i->sink,
-           pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec),
-           pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map),
-           pa_format_info_snprint(f, sizeof(f), i->format),
-           pa_yes_no(i->mute),
-           pa_cvolume_snprint(cv, sizeof(cv), &i->volume),
-           pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), &i->volume),
-           pa_cvolume_get_balance(&i->volume, &i->channel_map),
-           (double) i->buffer_usec,
-           (double) i->sink_usec,
-           i->resample_method ? i->resample_method : "n/a",
-           pl = pa_proplist_to_string_sep(i->proplist, "\n\t\t"));
-
-    pa_xfree(pl);
-}
-
-
-static void list_sinks()
-{
-	int ret = 1;
-    char *server = NULL;
-	g_print("listing sinks\n");
-       pa_mainloop *m = pa_mainloop_new();
-       mainloop_api = pa_mainloop_get_api(m);
-       proplist = pa_proplist_new();
-       context = pa_context_new_with_proplist(mainloop_api, NULL, proplist);
-       /*pa_operation_unref(*/pa_context_get_sink_input_info_list(context, get_sink_input_info_callback, NULL)/*)*/;
-       //pa_context_set_state_callback(context, context_state_callback, NULL);
-       pa_context_connect(context, server, 0, NULL);
-       pa_mainloop_run(m, &ret);
-}
-
-
-//run in separate thread
-static void* pulse_read_audio(void *userdata) 
-{
-	int error;
-	
-	struct paRecordData *pdata = (struct paRecordData*) userdata;
-	/* The sample type to use */
-	pa_sample_spec ss;
-	if (BIGENDIAN)
-		ss.format = PA_SAMPLE_FLOAT32BE;
-	else
-		ss.format = PA_SAMPLE_FLOAT32LE;
-	
-	__LOCK_MUTEX(__AMUTEX);
-		gboolean capVid = pdata->capVid;
-		int skip_n = pdata->skip_n;
-		pdata->streaming = TRUE;
-		ss.rate = pdata->samprate;
-		ss.channels = pdata->channels;
-	__UNLOCK_MUTEX(__AMUTEX);
-
-	g_print("starting pulse audio thread: %d hz- %d ch\n",ss.rate, ss.channels);
-	if (!(pdata->pulse_simple = pa_simple_new(NULL, "Guvcview Video Capture", PA_STREAM_RECORD, NULL, "pcm.record", &ss, NULL, NULL, &error))) 
-	{
-		g_printerr(": pa_simple_new() failed: %s\n", pa_strerror(error));
-		goto finish;
-	}
-	
-	/* Record some data ... */
-	while(capVid)
-	{
-		if (pa_simple_read(pdata->pulse_simple, pdata->recordedSamples, pdata->aud_numBytes, &error) < 0) 
-		{
-			g_printerr("pulse: pa_simple_read() failed: %s\n", pa_strerror(error));
-			goto finish;
-		}
-
-		__LOCK_MUTEX(__AMUTEX);
-			capVid = pdata->capVid;
-			/*first frame time stamp*/
-			if(pdata->a_ts <= 0)
-			{
-				if((pdata->ts_ref > 0) && (pdata->ts_ref < pdata->snd_begintime)) 
-					pdata->a_ts = pdata->snd_begintime - pdata->ts_ref;
-				else pdata->a_ts = 1;
-			}
-			else /*increment time stamp for audio frame*/
-				pdata->a_ts += (G_NSEC_PER_SEC * pdata->aud_numSamples)/(pdata->samprate * pdata->channels);
-	
-			skip_n = pdata->skip_n;
-		__UNLOCK_MUTEX(__AMUTEX);
-		
-		if (!skip_n) //skip audio while were skipping video frames
-		{
-			__LOCK_MUTEX( __AMUTEX );
-				if(!pdata->audio_buffpdata->w_ind.used)
-				{
-					
-					/*copy data to audio buffer*/
-					memcpy(pdata->audio_buffpdata->w_ind.frame, pdata->recordedSamples, pdata->aud_numBytes);
-					pdata->audio_buffpdata->w_ind.time_stamp = pdata->a_ts + pdata->delay;
-					pdata->audio_buffpdata->w_ind.used = TRUE;
-					NEXT_IND(pdata->w_ind, AUDBUFF_SIZE);
-				}
-				else
-				{
-					//drop audio data
-					g_printerr("AUDIO: droping audio data\n");
-				}
-			__UNLOCK_MUTEX( __AMUTEX );
-		}
-		else 
-		{
-			pdata->snd_begintime = ns_time_monotonic();
-			pdata->a_ts = 0;
-		}
-	}
-
-finish:
-	g_print("audio thread exited\n");
-	pdata->streaming = FALSE;
-	if (pdata->pulse_simple)
-		pa_simple_free(pdata->pulse_simple);
-	return (NULL);
-}
-
-
-int
-pulse_init_audio(struct paRecordData* pdata)
-{	
-	list_sinks();
-	//start audio capture thread
-	if(__THREAD_CREATE(&pdata->pulse_read_th, (GThreadFunc) pulse_read_audio,pdata))  
-	{
-		g_printerr("Pulse thread creation failed\n");
-		return (-1);
-	}
-	return (0);
-} 
-
-#endif

guvcview-src-1.6.1.tar.gz/.gitignore Added

guvcview-src-1.5.3.tar.gz/ChangeLog -> guvcview-src-1.6.1.tar.gz/ChangeLog Changed

guvcview-src-1.5.3.tar.gz/INSTALL -> guvcview-src-1.6.1.tar.gz/INSTALL Changed

guvcview-src-1.5.3.tar.gz/Makefile.am -> guvcview-src-1.6.1.tar.gz/Makefile.am Changed

@@ -1,90 +1,35 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src po pixmaps
+SUBDIRS = src po data
 
 ACLOCAL_AMFLAGS = -I m4
 
-guvcviewmandir = ${datadir}/man/man1
-guvcviewman_DATA = pixmaps/guvcview.1.gz
-
-guvcviewdocdir = ${datadir}/doc/guvcview
-guvcviewdoc_DATA = \
+docdir = ${datadir}/doc/guvcview
+doc_DATA = \
 	README\
 	COPYING\
 	AUTHORS\
 	ChangeLog\
 	INSTALL
 
-pixmapsdir = ${datadir}/pixmaps/guvcview
-
-pixmaps_DATA = \
-		pixmaps/guvcview.png\
-		pixmaps/camera.png\
-		pixmaps/movie.png\
-		pixmaps/save.png\
-		pixmaps/defaults.png\
-		pixmaps/image_controls.png\
-		pixmaps/video_controls.png\
-		pixmaps/audio_controls.png\
-		pixmaps/images_folder.png\
-		pixmaps/videos_folder.png\
-		pixmaps/controls_folder.png\
-		pixmaps/close.png
-
-if DESKTOP
-applicationdir = ${datadir}/applications
-application_DATA = pixmaps/guvcview.desktop
-endif
-
-if DEBIAN_MENU
-menudir = ${datadir}/menu
-menu_DATA = pixmaps/guvcview
-endif
-
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update
+	
 EXTRA_DIST = \
-		src\
-		$(guvcviewdoc_DATA)\
-		$(application_DATA)\
-		$(menu_DATA)\
-		$(pixmaps_DATA)
-
-check-gettext:
-	@if test x$(USE_NLS) != "xyes" ; then echo "Missing gettext. Rerun configure and check for" \
-	"'checking whether to use NLS... yes'!" ; exit 1 ; fi
-
-update-po: check-gettext
-	@find $(srcdir)/src/ -name "*.cpp" -print | sort > $(srcdir)/po/POTFILES.in.2 ; \
-	if diff $(srcdir)/po/POTFILES.in $(srcdir)/po/POTFILES.in.2 >/dev/null 2>&1 ; then \
-		rm -f $(srcdir)/po/POTFILES.in.2 ; \
-	else \
-		mv $(srcdir)/po/POTFILES.in.2 $(srcdir)/po/POTFILES.in ; \
-	fi
-	cd po && $(MAKE) $(AM_MAKEFLAGS) update-po
-
-update-gmo: check-gettext
-	cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo
-
-force-update-gmo: check-gettext
-	touch po/*.po
-	cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo
-
-$(guvcviewman_DATA):
-	cd pixmaps && $(MAKE) $(AM_MAKEFLAGS) .manpage
-
-$(pixmaps_DATA):
-	cd pixmaps && $(MAKE) $(AM_MAKEFLAGS) .png
+	bootstrap.sh \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in
 
-if DEBIAN_MENU
-$(menu_DATA):
-	cd pixmaps && $(MAKE) $(AM_MAKEFLAGS) .menu
-endif
+update-pot:
+	$(MAKE) -C po "$(GETTEXT_PACKAGE).pot"
 
-if DESKTOP
-# builds desktop menu entry
-$(application_DATA): 
-	cd pixmaps && $(MAKE) $(AM_MAKEFLAGS) .desktop
-endif
+DISTCHECK_CONFIGURE_FLAGS = --enable-maintainer-flags=no
 
+DIST_SUBDIRS = ${SUBDIRS}
+	
 # Copy all the spec files. Of cource, only one is actually used.
 dist-hook:
 	for specfile in *.spec; do \

guvcview-src-1.5.3.tar.gz/Makefile.in -> guvcview-src-1.6.1.tar.gz/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -32,8 +32,6 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -41,8 +39,8 @@
 	INSTALL NEWS config.guess config.rpath config.sub depcomp \
 	install-sh missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -51,6 +49,12 @@
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -81,11 +85,14 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(applicationdir)" \
-	"$(DESTDIR)$(guvcviewdocdir)" "$(DESTDIR)$(guvcviewmandir)" \
-	"$(DESTDIR)$(menudir)" "$(DESTDIR)$(pixmapsdir)"
-DATA = $(application_DATA) $(guvcviewdoc_DATA) $(guvcviewman_DATA) \
-	$(menu_DATA) $(pixmaps_DATA)
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(docdir)"
+DATA = $(doc_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -93,14 +100,15 @@
 	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$^/*$/.*$$,\1,'; \
@@ -129,9 +137,13 @@
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -165,6 +177,10 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -175,6 +191,7 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -191,9 +208,6 @@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
 PULSE_CFLAGS = @PULSE_CFLAGS@
 PULSE_LIBS = @PULSE_LIBS@
 SET_MAKE = @SET_MAKE@
@@ -207,29 +221,20 @@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
-build = @build@
 build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-docdir = @docdir@
+docdir = ${datadir}/doc/guvcview
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-host = @host@
 host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -253,49 +258,33 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = src po pixmaps
+SUBDIRS = src po data
 ACLOCAL_AMFLAGS = -I m4
-guvcviewmandir = ${datadir}/man/man1
-guvcviewman_DATA = pixmaps/guvcview.1.gz
-guvcviewdocdir = ${datadir}/doc/guvcview
-guvcviewdoc_DATA = \
+doc_DATA = \
 	README\
 	COPYING\
 	AUTHORS\
 	ChangeLog\
 	INSTALL
 
-pixmapsdir = ${datadir}/pixmaps/guvcview
-pixmaps_DATA = \
-		pixmaps/guvcview.png\
-		pixmaps/camera.png\
-		pixmaps/movie.png\
-		pixmaps/save.png\
-		pixmaps/defaults.png\
-		pixmaps/image_controls.png\
-		pixmaps/video_controls.png\
-		pixmaps/audio_controls.png\
-		pixmaps/images_folder.png\
-		pixmaps/videos_folder.png\
-		pixmaps/controls_folder.png\
-		pixmaps/close.png
-
-@DESKTOP_TRUE@applicationdir = ${datadir}/applications
-@DESKTOP_TRUE@application_DATA = pixmaps/guvcview.desktop
-@DEBIAN_MENU_TRUE@menudir = ${datadir}/menu
-@DEBIAN_MENU_TRUE@menu_DATA = pixmaps/guvcview
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update
+
 EXTRA_DIST = \
-		src\
-		$(guvcviewdoc_DATA)\
-		$(application_DATA)\
-		$(menu_DATA)\
-		$(pixmaps_DATA)
+	bootstrap.sh \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-maintainer-flags=no
+DIST_SUBDIRS = ${SUBDIRS}
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -331,10 +320,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -346,106 +333,24 @@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-install-applicationDATA: $(application_DATA)
+install-docDATA: $(doc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(applicationdir)" || $(MKDIR_P) "$(DESTDIR)$(applicationdir)"
-	@list='$(application_DATA)'; test -n "$(applicationdir)" || list=; \
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(applicationdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(applicationdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
 	done
 
-uninstall-applicationDATA:
+uninstall-docDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(application_DATA)'; test -n "$(applicationdir)" || list=; \
+	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(applicationdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(applicationdir)" && rm -f $$files
-install-guvcviewdocDATA: $(guvcviewdoc_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(guvcviewdocdir)" || $(MKDIR_P) "$(DESTDIR)$(guvcviewdocdir)"
-	@list='$(guvcviewdoc_DATA)'; test -n "$(guvcviewdocdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(guvcviewdocdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(guvcviewdocdir)" || exit $$?; \
-	done
-
-uninstall-guvcviewdocDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(guvcviewdoc_DATA)'; test -n "$(guvcviewdocdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(guvcviewdocdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(guvcviewdocdir)" && rm -f $$files
-install-guvcviewmanDATA: $(guvcviewman_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(guvcviewmandir)" || $(MKDIR_P) "$(DESTDIR)$(guvcviewmandir)"
-	@list='$(guvcviewman_DATA)'; test -n "$(guvcviewmandir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(guvcviewmandir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(guvcviewmandir)" || exit $$?; \
-	done
-
-uninstall-guvcviewmanDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(guvcviewman_DATA)'; test -n "$(guvcviewmandir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(guvcviewmandir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(guvcviewmandir)" && rm -f $$files
-install-menuDATA: $(menu_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(menudir)" || $(MKDIR_P) "$(DESTDIR)$(menudir)"
-	@list='$(menu_DATA)'; test -n "$(menudir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(menudir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(menudir)" || exit $$?; \
-	done
-
-uninstall-menuDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(menu_DATA)'; test -n "$(menudir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(menudir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(menudir)" && rm -f $$files
-install-pixmapsDATA: $(pixmaps_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pixmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)"
-	@list='$(pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pixmapsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapsdir)" || exit $$?; \
-	done
-
-uninstall-pixmapsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pixmapsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pixmapsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -657,7 +562,11 @@
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -665,7 +574,7 @@
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -696,6 +605,8 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -715,6 +626,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -743,8 +655,16 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -765,7 +685,7 @@
 all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(applicationdir)" "$(DESTDIR)$(guvcviewdocdir)" "$(DESTDIR)$(guvcviewmandir)" "$(DESTDIR)$(menudir)" "$(DESTDIR)$(pixmapsdir)"; do \
+	for dir in "$(DESTDIR)$(docdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -778,10 +698,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -789,6 +714,7 @@
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -814,8 +740,7 @@
 
 info-am:
 
-install-data-am: install-applicationDATA install-guvcviewdocDATA \
-	install-guvcviewmanDATA install-menuDATA install-pixmapsDATA
+install-data-am: install-docDATA
 
 install-dvi: install-dvi-recursive
 
@@ -861,9 +786,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-applicationDATA uninstall-guvcviewdocDATA \
-	uninstall-guvcviewmanDATA uninstall-menuDATA \
-	uninstall-pixmapsDATA
+uninstall-am: uninstall-docDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
 	ctags-recursive install-am install-strip tags-recursive
@@ -871,56 +794,22 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
+	dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-applicationDATA install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-guvcviewdocDATA install-guvcviewmanDATA install-html \
+	install-data install-data-am install-docDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
-	install-menuDATA install-pdf install-pdf-am \
-	install-pixmapsDATA install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-applicationDATA \
-	uninstall-guvcviewdocDATA uninstall-guvcviewmanDATA \
-	uninstall-menuDATA uninstall-pixmapsDATA
-
-
-check-gettext:
-	@if test x$(USE_NLS) != "xyes" ; then echo "Missing gettext. Rerun configure and check for" \
-	"'checking whether to use NLS... yes'!" ; exit 1 ; fi
-
-update-po: check-gettext
-	@find $(srcdir)/src/ -name "*.cpp" -print | sort > $(srcdir)/po/POTFILES.in.2 ; \
-	if diff $(srcdir)/po/POTFILES.in $(srcdir)/po/POTFILES.in.2 >/dev/null 2>&1 ; then \
-		rm -f $(srcdir)/po/POTFILES.in.2 ; \
-	else \
-		mv $(srcdir)/po/POTFILES.in.2 $(srcdir)/po/POTFILES.in ; \
-	fi
-	cd po && $(MAKE) $(AM_MAKEFLAGS) update-po
-
-update-gmo: check-gettext
-	cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo
-
-force-update-gmo: check-gettext
-	touch po/*.po
-	cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo
-
-$(guvcviewman_DATA):
-	cd pixmaps && $(MAKE) $(AM_MAKEFLAGS) .manpage
-
-$(pixmaps_DATA):
-	cd pixmaps && $(MAKE) $(AM_MAKEFLAGS) .png
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am uninstall-docDATA
 
-@DEBIAN_MENU_TRUE@$(menu_DATA):
-@DEBIAN_MENU_TRUE@	cd pixmaps && $(MAKE) $(AM_MAKEFLAGS) .menu
 
-# builds desktop menu entry
-@DESKTOP_TRUE@$(application_DATA): 
-@DESKTOP_TRUE@	cd pixmaps && $(MAKE) $(AM_MAKEFLAGS) .desktop
+update-pot:
+	$(MAKE) -C po "$(GETTEXT_PACKAGE).pot"
 
 # Copy all the spec files. Of cource, only one is actually used.
 dist-hook:

guvcview-src-1.5.3.tar.gz/README -> guvcview-src-1.6.1.tar.gz/README Changed

@@ -3,6 +3,37 @@
 
 Basic Configuration
 ===================
+*Dependencies:
+--------------
+
+Guvcview depends on the following:
+ - intltool,
+ - autotools, 
+ - libsdl, 
+ - libgtk-3, 
+ - portaudio19, 
+ - libpng, 
+ - libavcodec, 
+ - libavutil, 
+ - libv4l, 
+ - libudev,
+ - libpulse (optional)
+
+On most distributions you can just install the development 
+packages:
+ intltool, autotools-dev, libsdl1.2-dev, libgtk-3-dev, 
+ portaudio19-dev, libpng12-dev, libavcodec-dev, libavutil-dev,
+ libv4l-dev, libudev-dev, libpulse-dev
+
+*Build configuration:
+---------------------
+(./bootstrap.sh; ./configure)
+
+The configure script is generated from configure.ac by autoconf,
+the helper script ./bootstrap.sh can be used for this, it will also
+run the generated configure with the command line options passed.
+After configuration a simple 'make && make install' will build and
+install guvcview and all the associated data files.
 
 *Data Files:
 ------------
@@ -12,11 +43,11 @@
 setting a different prefix (--prefix=BASEDIR) during configuration
 will change the installation path to BASEDIR/share.
 
-Built files, src/guvcview and pixmaps/gnome.desktop, are dependent 
+Built files, src/guvcview and data/gnome.desktop, are dependent 
 on this path, so if a new prefix is set a make clean is required 
 before issuing the make command. 
 
-After running the configure script the normal, make | make install 
+After running the configure script the normal, make && make install 
 should build and install all the necessary files.    
     
  
@@ -35,21 +66,24 @@
 *guvcview.desktop:
 ------------------
 
-(pixmaps/guvcview.desktop)
+(data/guvcview.desktop)
 
 The desktop file (gnome menu entry) is built from the
-pixmaps/Makefile.am definition and is dependent on the 
+data/guvcview.desktop.in definition and is dependent on the 
 configure --prefix setting, any changes to this, must 
-be done in pixmaps/Makefile.am, the file must be removed 
-(make clean) before building a new one with the make command.
+be done in data/guvcview.desktop.in.
 
+*configuration files:
+---------------------
+(~/.guvcviewrc)
 
+The configuration file is saved into the $HOME dir when 
+exiting guvcview. If a video device with index > 0,
+e.g: /dev/video1 is used then the file stored will be
+named .guvcviewrc-video1
 
 Executing guvcview
 ================== 
 
 For instructions on the command line args 
 execute "guvcview --help".
-
-Detailed information will be added in future 
-versions.

guvcview-src-1.5.3.tar.gz/config.h.in -> guvcview-src-1.6.1.tar.gz/config.h.in Changed

guvcview-src-1.5.3.tar.gz/configure -> guvcview-src-1.6.1.tar.gz/configure Changed

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for guvcview 1.5.3.
+# Generated by GNU Autoconf 2.68 for guvcview 1.6.1.
 #
-# Report bugs to <<pj.assis@gmail.com>>.
+# Report bugs to <http://guvcview.sourceforge.net/>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -239,10 +239,10 @@
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: <pj.assis@gmail.com> about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
+$0: http://guvcview.sourceforge.net/ about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -560,9 +560,9 @@
 # Identity of this package.
 PACKAGE_NAME='guvcview'
 PACKAGE_TARNAME='guvcview'
-PACKAGE_VERSION='1.5.3'
-PACKAGE_STRING='guvcview 1.5.3'
-PACKAGE_BUGREPORT='<pj.assis@gmail.com>'
+PACKAGE_VERSION='1.6.1'
+PACKAGE_STRING='guvcview 1.6.1'
+PACKAGE_BUGREPORT='http://guvcview.sourceforge.net/'
 PACKAGE_URL=''
 
 ac_default_prefix=/usr/local
@@ -625,33 +625,47 @@
 INTLLIBS
 INSTOBJEXT
 GMOFILES
-DATADIRNAME
 CATOBJEXT
 CATALOGS
-XGETTEXT
-GMSGFMT
 MSGFMT_OPTS
+DATADIRNAME
+ALL_LINGUAS
+INTLTOOL_PERL
+GMSGFMT
 MSGFMT
+MSGMERGE
+XGETTEXT
+INTLTOOL_POLICY_RULE
+INTLTOOL_SERVICE_RULE
+INTLTOOL_THEME_RULE
+INTLTOOL_SCHEMAS_RULE
+INTLTOOL_CAVES_RULE
+INTLTOOL_XML_NOMERGE_RULE
+INTLTOOL_XML_RULE
+INTLTOOL_KBD_RULE
+INTLTOOL_XAM_RULE
+INTLTOOL_UI_RULE
+INTLTOOL_SOUNDLIST_RULE
+INTLTOOL_SHEET_RULE
+INTLTOOL_SERVER_RULE
+INTLTOOL_PONG_RULE
+INTLTOOL_OAF_RULE
+INTLTOOL_PROP_RULE
+INTLTOOL_KEYS_RULE
+INTLTOOL_DIRECTORY_RULE
+INTLTOOL_DESKTOP_RULE
+INTLTOOL_EXTRACT
+INTLTOOL_MERGE
+INTLTOOL_UPDATE
 USE_NLS
 GETTEXT_PACKAGE
-PTHREAD_CFLAGS
-PTHREAD_LIBS
-PTHREAD_CC
-acx_pthread_config
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
 EGREP
 GREP
 CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -691,6 +705,10 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 target_alias
 host_alias
 build_alias
@@ -732,9 +750,11 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_maintainer_mode
 enable_dependency_tracking
 enable_debug
+enable_nls
 enable_debian_menu
 enable_desktop
 enable_pulse
@@ -1297,7 +1317,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 guvcview 1.5.3 to adapt to many kinds of systems.
+\`configure' configures guvcview 1.6.1 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1358,16 +1378,12 @@
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD guessed
-  --host=HOST       cross-compile to build programs to run on HOST BUILD
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of guvcview 1.5.3:";;
+     short | recursive ) echo "Configuration of guvcview 1.6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1375,15 +1391,18 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE=ARG  include FEATURE ARG=yes
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-debug          enable debug compile w/ debugging - if \$CFLAGS is
                           set, add -g there, too
+  --disable-nls           do not use Native Language Support
   --disable-debian-menu   disable debian menu (default: enabled)
   --disable-desktop       disable desktop file (default: enabled)
-  --enable-pulse          enable pulseaudio support (default: disabled)
+  --disable-pulse         disable pulseaudio support (default: enabled)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1408,7 +1427,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <<pj.assis@gmail.com>>.
+Report bugs to <http://guvcview.sourceforge.net/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1471,7 +1490,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-guvcview configure 1.5.3
+guvcview configure 1.6.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1648,6 +1667,73 @@
 
 } # ac_fn_c_try_run
 
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -1718,9 +1804,9 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ----------------------------------- ##
-## Report this to <pj.assis@gmail.com> ##
-## ----------------------------------- ##"
+( $as_echo "## ----------------------------------------------- ##
+## Report this to http://guvcview.sourceforge.net/ ##
+## ----------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -1769,78 +1855,11 @@
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by guvcview $as_me 1.5.3, which was
+It was created by guvcview $as_me 1.6.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2188,6 +2207,46 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=0;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+
 am__api_version='1.11'
 
 ac_aux_dir=
@@ -2655,7 +2714,7 @@
 
 # Define the identity of the package.
  PACKAGE='guvcview'
- VERSION='1.5.3'
+ VERSION='1.6.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2685,11 +2744,11 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -2782,6 +2841,7 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3595,6 +3655,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3654,7 +3715,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -4319,6 +4380,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4378,7 +4440,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -4813,216 +4875,107 @@
 
 fi
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
+ACX_PTHREAD()
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
+
+
+
+
+
+# The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
+# a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
+# disabled.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if you specifically want to enable debug-code -g" >&5
+$as_echo_n "checking if you specifically want to enable debug-code -g... " >&6; }
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug; enable_debug=yes
 else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+  enable_debug=no
 fi
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_debug" >&5
+$as_echo "$enable_debug" >&6; }
+
+if test "x$enable_debug" = "xyes" ; then
+	test -z "$ORIGINAL_CFLAGS" && CFLAGS=`echo ${CFLAGS} | sed -e 's/-O1-9\? //' -e 's/-O1-9\?$//'`
+	if test "$CC" = gcc; then
+		CFLAGS="$CFLAGS -g"
+	fi
+#else
+#	CF_STRIP_G_OPT(CFLAGS)
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
+GETTEXT_PACKAGE=guvcview
 
 
-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
+cat >>confdefs.h <<_ACEOF
+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+_ACEOF
 
-acx_pthread_ok=no
 
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
-$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; }
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_join ();
-int
-main ()
-{
-return pthread_join ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  acx_pthread_ok=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+  enableval=$enable_nls; USE_NLS=$enableval
+else
+  USE_NLS=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5
-$as_echo "$acx_pthread_ok" >&6; }
-        if test x"$acx_pthread_ok" = xno; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
+
+
+case "$am__api_version" in
+    1.01234)
+	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+    ;;
+    *)
+    ;;
+esac
+
+if test -n "0.40"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40" >&5
+$as_echo_n "checking for intltool >= 0.40... " >&6; }
+
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	as_fn_error $? "Your intltool is too old.  You need intltool 0.40 or later." "$LINENO" 5
 fi
 
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads -lthread, but it
-#      doesn't hurt to check since this sometimes defines pthreads too;
-#      also defines -D_REENTRANT)
-#      ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case "${host_cpu}-${host_os}" in
-        *solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-        # a function called by this macro, so we could check for that, but
-        # who knows whether they'll stub that too in a future libc.)  So,
-        # we'll just look for -pthreads and -lpthread first:
-
-        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
-        ;;
-esac
-
-if test x"$acx_pthread_ok" = xno; then
-for flag in $acx_pthread_flags; do
-
-        case $flag in
-                none)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
-$as_echo_n "checking whether pthreads work without any flags... " >&6; }
-                ;;
-
-                -*)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5
-$as_echo_n "checking whether pthreads work with $flag... " >&6; }
-                PTHREAD_CFLAGS="$flag"
-                ;;
-
-		pthread-config)
-		# Extract the first word of "pthread-config", so it can be a program name with args.
-set dummy pthread-config; ac_word=$2
+# Extract the first word of "intltool-update", so it can be a program name with args.
+set dummy intltool-update; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_acx_pthread_config+:} false; then :
+if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$acx_pthread_config"; then
-  ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $INTLTOOL_UPDATE in
+  \\/* | ?:\\/*)
+  ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_acx_pthread_config="yes"
+    ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5030,155 +4983,240 @@
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no"
-fi
+  ;;
+esac
 fi
-acx_pthread_config=$ac_cv_prog_acx_pthread_config
-if test -n "$acx_pthread_config"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5
-$as_echo "$acx_pthread_config" >&6; }
+INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+if test -n "$INTLTOOL_UPDATE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
+$as_echo "$INTLTOOL_UPDATE" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-		if test x"$acx_pthread_config" = xno; then continue; fi
-		PTHREAD_CFLAGS="`pthread-config --cflags`"
-		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-		;;
-
-                *)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5
-$as_echo_n "checking for the pthreads library -l$flag... " >&6; }
-                PTHREAD_LIBS="-l$flag"
-                ;;
-        esac
-
-        save_LIBS="$LIBS"
-        save_CFLAGS="$CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <pthread.h>
-int
-main ()
-{
-pthread_t th; pthread_join(th, 0);
-                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  acx_pthread_ok=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+# Extract the first word of "intltool-merge", so it can be a program name with args.
+set dummy intltool-merge; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $INTLTOOL_MERGE in
+  \\/* | ?:\\/*)
+  ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
+  ;;
+esac
+fi
+INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+if test -n "$INTLTOOL_MERGE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
+$as_echo "$INTLTOOL_MERGE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5
-$as_echo "$acx_pthread_ok" >&6; }
-        if test "x$acx_pthread_ok" = xyes; then
-                break;
-        fi
 
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
+# Extract the first word of "intltool-extract", so it can be a program name with args.
+set dummy intltool-extract; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $INTLTOOL_EXTRACT in
+  \\/* | ?:\\/*)
+  ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
 done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+if test -n "$INTLTOOL_EXTRACT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
+$as_echo "$INTLTOOL_EXTRACT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-# Various other checks:
-if test "x$acx_pthread_ok" = xyes; then
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
-$as_echo_n "checking for joinable pthread attribute... " >&6; }
-	attr_name=unknown
-	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <pthread.h>
-int
-main ()
-{
-int attr=$attr; return attr;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  attr_name=$attr; break
+
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	done
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5
-$as_echo "$attr_name" >&6; }
-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
 
-cat >>confdefs.h <<_ACEOF
-#define PTHREAD_CREATE_JOINABLE $attr_name
-_ACEOF
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
 
-        fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5
-$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
-        flag=no
-        case "${host_cpu}-${host_os}" in
-            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
-            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
-        esac
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
-$as_echo "${flag}" >&6; }
-        if test "x$flag" != xno; then
-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-        fi
 
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
 
-        # More AIX lossage: must compile with xlc_r or cc_r
-	if test x"$GCC" != xyes; then
-          for ac_prog in xlc_r cc_r
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check the gettext tools to make sure they are GNU
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PTHREAD_CC+:} false; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$PTHREAD_CC"; then
-  ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $XGETTEXT in
+  \\/* | ?:\\/*)
+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_PTHREAD_CC="$ac_prog"
+    ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5186,89 +5224,257 @@
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
-if test -n "$PTHREAD_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
-$as_echo "$PTHREAD_CC" >&6; }
+XGETTEXT=$ac_cv_path_XGETTEXT
+if test -n "$XGETTEXT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$PTHREAD_CC" && break
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGMERGE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MSGMERGE in
+  \\/* | ?:\\/*)
+  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
 done
-test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}"
+  done
+IFS=$as_save_IFS
 
-        else
-          PTHREAD_CC=$CC
-	fi
+  ;;
+esac
+fi
+MSGMERGE=$ac_cv_path_MSGMERGE
+if test -n "$MSGMERGE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
 else
-        PTHREAD_CC="$CC"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MSGFMT in
+  \\/* | ?:\\/*)
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+  ;;
+esac
+fi
+MSGFMT=$ac_cv_path_MSGFMT
+if test -n "$MSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_pthread_ok" = xyes; then
-
-$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
+# Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GMSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GMSGFMT in
+  \\/* | ?:\\/*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-        :
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
 else
-        acx_pthread_ok=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
+
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
-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
 
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $INTLTOOL_PERL in
+  \\/* | ?:\\/*)
+  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+  ;;
+esac
+fi
+INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+if test -n "$INTLTOOL_PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
+$as_echo "$INTLTOOL_PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
+if test -z "$INTLTOOL_PERL"; then
+   as_fn_error $? "perl not found" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+$as_echo_n "checking for perl >= 5.8.1... " >&6; }
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
+else
+   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+$as_echo "$IT_PERL_VERSION" >&6; }
+fi
+if test "x" != "xno-xml"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+$as_echo_n "checking for XML::Parser... " >&6; }
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+   else
+       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
+   fi
+fi
 
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
 
 
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-# The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
-# a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
-# disabled.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if you specifically want to enable debug-code -g" >&5
-$as_echo_n "checking if you specifically want to enable debug-code -g... " >&6; }
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug; enable_debug=yes
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  DATADIRNAME=share
 else
-  enable_debug=no
+  case $host in
+    *-*-solaris*)
+                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+  DATADIRNAME=share
+else
+  DATADIRNAME=lib
 fi
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_debug" >&5
-$as_echo "$enable_debug" >&6; }
-
-if test "x$enable_debug" = "xyes" ; then
-	test -z "$ORIGINAL_CFLAGS" && CFLAGS=`echo ${CFLAGS} | sed -e 's/-O1-9\? //' -e 's/-O1-9\?$//'`
-	if test "$CC" = gcc; then
-		CFLAGS="$CFLAGS -g"
-	fi
-#else
-#	CF_STRIP_G_OPT(CFLAGS)
+    ;;
+    *)
+    DATADIRNAME=lib
+    ;;
+    esac
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 
 
 
-GETTEXT_PACKAGE=guvcview
-
 
-cat >>confdefs.h <<_ACEOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-_ACEOF
 
 
 ALL_LINGUAS="bs cs da de es eu fo fr gl he hr it ja nl pl pt pt_BR ru sr tr uk zh_TW"
@@ -5874,6 +6080,10 @@
 fi
 
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -6256,9 +6466,9 @@
 $as_echo_n "checking if you want to enable pulse support... " >&6; }
 # Check whether --enable-pulse was given.
 if test "${enable_pulse+set}" = set; then :
-  enableval=$enable_pulse; enable_pulse=yes
+  enableval=$enable_pulse; enable_pulse=no
 else
-  enable_pulse=no
+  enable_pulse=yes
 fi
 
 
@@ -6275,12 +6485,12 @@
     pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-simple >= 0.9.15\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libpulse-simple >= 0.9.15") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.15\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.15") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags "libpulse-simple >= 0.9.15" 2>/dev/null`
+  pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags "libpulse >= 0.9.15" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -6292,12 +6502,12 @@
     pkg_cv_PULSE_LIBS="$PULSE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse-simple >= 0.9.15\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libpulse-simple >= 0.9.15") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.15\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.15") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs "libpulse-simple >= 0.9.15" 2>/dev/null`
+  pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs "libpulse >= 0.9.15" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -6318,9 +6528,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpulse-simple >= 0.9.15" 2>&1`
+	        PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpulse >= 0.9.15" 2>&1`
         else
-	        PULSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpulse-simple >= 0.9.15" 2>&1`
+	        PULSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpulse >= 0.9.15" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PULSE_PKG_ERRORS" >&5
@@ -6345,7 +6555,8 @@
 
 	else
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libpulse missing... pulse support will be disabled." >&5
-$as_echo "$as_me: WARNING: libpulse missing... pulse support will be disabled." >&2;}
+$as_echo "$as_me: WARNING: libpulse missing... pulse support will be disabled." >&2;};
+	  enable_pulse = no
 	fi
 fi
 
@@ -6612,7 +6823,7 @@
  esac
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in pixmaps/Makefile"
+ac_config_files="$ac_config_files Makefile data/Makefile data/icons/Makefile data/guvcview.desktop.in data/guvcview.in po/Makefile.in src/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6747,6 +6958,10 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+
+  ac_config_commands="$ac_config_commands po/stamp-it"
+
+
 if test -z "${DEBIAN_MENU_TRUE}" && test -z "${DEBIAN_MENU_FALSE}"; then
   as_fn_error $? "conditional \"DEBIAN_MENU\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -7165,7 +7380,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by guvcview $as_me 1.5.3, which was
+This file was extended by guvcview $as_me 1.6.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7225,13 +7440,13 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <<pj.assis@gmail.com>>."
+Report bugs to <http://guvcview.sourceforge.net/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-guvcview config.status 1.5.3
+guvcview config.status 1.6.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -7365,9 +7580,13 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
+    "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
+    "data/guvcview.desktop.in") CONFIG_FILES="$CONFIG_FILES data/guvcview.desktop.in" ;;
+    "data/guvcview.in") CONFIG_FILES="$CONFIG_FILES data/guvcview.in" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-    "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -8061,6 +8280,26 @@
     "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac ;;
+    "po/stamp-it":C)
+    if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
+       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+    fi
+    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
+    >"po/stamp-it.tmp"
+    sed '/^#/d
+	 s/^.* *//
+	 /^ 	*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
+
+    sed '/^POTFILES =/,/^\\$/ {
+		/^POTFILES =/!d
+		r po/POTFILES
+	  }
+	 ' "po/Makefile.in" >"po/Makefile"
+    rm -f "po/Makefile.tmp"
+    mv "po/stamp-it.tmp" "po/stamp-it"
+   ;;
 
   esac
 done # for ac_tag
@@ -8099,3 +8338,35 @@
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}:
+
+  guvcview $VERSION
+  ----------------------
+
+  Prefix         : ${prefix}
+
+  Pulse API      : ${enable_pulse}
+
+  Desktop File   : ${enable_desktop}
+  Debian Menu    : ${enable_debian_menu}
+
+  Debug Symbols  : ${enable_debug}
+
+" >&5
+$as_echo "$as_me:
+
+  guvcview $VERSION
+  ----------------------
+
+  Prefix         : ${prefix}
+
+  Pulse API      : ${enable_pulse}
+
+  Desktop File   : ${enable_desktop}
+  Debian Menu    : ${enable_debian_menu}
+
+  Debug Symbols  : ${enable_debug}
+
+" >&6;}
+

guvcview-src-1.5.3.tar.gz/configure.ac -> guvcview-src-1.6.1.tar.gz/configure.ac Changed

@@ -7,8 +7,15 @@
 dnl --------------------------------------------------------------------------
 dnl Package definitions and initialization
 dnl --------------------------------------------------------------------------
-
-AC_INIT(guvcview, 1.5.3, <pj.assis@gmail.com>)
+m4_define(guvcview_major, 1)
+m4_define(guvcview_minor, 6)
+m4_define(guvcview_micro, 1)
+m4_define(guvcview_version,
+          guvcview_major.guvcview_minor.guvcview_micro)
+
+AC_INIT(guvcview,guvcview_version,http://guvcview.sourceforge.net/)
+m4_ifdef(AM_SILENT_RULES,AM_SILENT_RULES(yes))
+		  
 AM_INIT_AUTOMAKE(gnu)
 AC_CONFIG_MACRO_DIR(m4)
 AM_CONFIG_HEADER(config.h)
@@ -25,6 +32,7 @@
 AC_ISC_POSIX
 AC_PROG_CC
 AC_HEADER_STDC
+
 dnl --------------------------------------------------------------------------
 dnl set pthread_libs and pthread_cflags
 dnl --------------------------------------------------------------------------
@@ -78,6 +86,8 @@
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", guvcview)
 
+IT_PROG_INTLTOOL(0.40)
+
 dnl --------------------------------------------------------------------------
 dnl Languages supported by guvcview.
 dnl --------------------------------------------------------------------------
@@ -121,21 +131,22 @@
 dnl Check for pulseaudio
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want to enable pulse support)
-AC_ARG_ENABLE(pulse, AS_HELP_STRING(--enable-pulse,
-		enable pulseaudio support (default: disabled)),
-	enable_pulse=yes,
-	enable_pulse=no)
+AC_ARG_ENABLE(pulse, AS_HELP_STRING(--disable-pulse,
+		disable pulseaudio support (default: enabled)),
+	enable_pulse=no,
+	enable_pulse=yes)
 
 AC_MSG_RESULT($enable_pulse)
 
 if test $enable_pulse = yes; then
-	PKG_CHECK_MODULES(PULSE, libpulse-simple >= 0.9.15, has_pulse=yes, has_pulse=no)
+	PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.15, has_pulse=yes, has_pulse=no)
 	AC_SUBST(PULSE_CFLAGS)
 	AC_SUBST(PULSE_LIBS)
 	if test "$has_pulse" = yes; then
 	  AC_DEFINE(PULSEAUDIO,1,set to 1 if pulseaudio installed)
 	else 
-	  AC_MSG_WARN(libpulse missing... pulse support will be disabled.)
+	  AC_MSG_WARN(libpulse missing... pulse support will be disabled.);
+	  enable_pulse = no
 	fi
 fi
 
@@ -170,10 +181,32 @@
 dnl --------------------------------------------------------------------------
 AC_C_BIGENDIAN 
 
-dnl Write output
-AC_OUTPUT(
-Makefile
-src/Makefile
-po/Makefile.in
-pixmaps/Makefile
+dnl Create the Makefiles
+AC_CONFIG_FILES(
+ Makefile
+ data/Makefile
+ data/icons/Makefile
+ data/guvcview.desktop.in
+ data/guvcview.in
+ po/Makefile.in
+ src/Makefile
 )
+AC_OUTPUT
+
+dnl Output the results
+AC_MSG_NOTICE(
+
+  guvcview $VERSION
+  ----------------------
+
+  Prefix         : ${prefix}
+
+  Pulse API      : ${enable_pulse}
+  
+  Desktop File   : ${enable_desktop}
+  Debian Menu    : ${enable_debian_menu}
+  
+  Debug Symbols  : ${enable_debug}
+  
+)
+

guvcview-src-1.6.1.tar.gz/data Added

guvcview-src-1.6.1.tar.gz/data/Makefile.am Added

guvcview-src-1.6.1.tar.gz/data/Makefile.in Added

@@ -0,0 +1,715 @@
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = data
+DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/guvcview.desktop.in.in \
+	$(srcdir)/guvcview.in.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = guvcview.desktop.in guvcview.in
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
+  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
+    if (++n$$2 == $(am__install_max)) \
+      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
+    END { for (dir in files) print dir, filesdir }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \
+	"$(DESTDIR)$(menudir)"
+NROFF = nroff
+MANS = $(dist_man_MANS)
+DATA = $(desktop_DATA) $(menu_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$^/*$/.*$$,\1,'; \
+  sed_rest='s,^^/*/*,,'; \
+  sed_last='s,^.*/$^/*$$$,\1,'; \
+  sed_butlast='s,/*^/*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DEPS_CFLAGS = @DEPS_CFLAGS@
+DEPS_LIBS = @DEPS_LIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LIBS = @PULSE_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = icons
+dist_man_MANS = guvcview.1
+@DEBIAN_MENU_TRUE@MENU_IN_FILES = guvcview.in
+@DEBIAN_MENU_TRUE@MENU_FILES = guvcview
+@DEBIAN_MENU_TRUE@menudir = ${datadir}/menu
+@DEBIAN_MENU_TRUE@menu_DATA = $(MENU_FILES)
+@DESKTOP_TRUE@DESKTOP_IN_FILES = guvcview.desktop.in
+@DESKTOP_TRUE@DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop)
+@DESKTOP_TRUE@desktopdir = $(datadir)/applications
+@DESKTOP_TRUE@desktop_DATA = $(DESKTOP_FILES)
+CLEANFILES = \
+		$(menu_DATA)\
+		$(desktop_DATA)
+
+EXTRA_DIST = \
+		$(DESKTOP_IN_FILES)\
+		$(MENU_IN_FILES)
+
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu data/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+guvcview.desktop.in: $(top_builddir)/config.status $(srcdir)/guvcview.desktop.in.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+guvcview.in: $(top_builddir)/config.status $(srcdir)/guvcview.in.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-man1: $(dist_man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1a-z*$$/p'; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^^10-9a-z*$$,1,;x' \
+	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1a-z*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^^10-9a-z*$$,1,;x' \
+	      -e 's,\.0-9a-z*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+install-desktopDATA: $(desktop_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
+	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
+	done
+
+uninstall-desktopDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+install-menuDATA: $(menu_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(menudir)" || $(MKDIR_P) "$(DESTDIR)$(menudir)"
+	@list='$(menu_DATA)'; test -n "$(menudir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(menudir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(menudir)" || exit $$?; \
+	done
+
+uninstall-menuDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(menu_DATA)'; test -n "$(menudir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(menudir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --!k*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --!k*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files$$0 = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(MANS) $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(menudir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-desktopDATA install-man install-menuDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man: install-man1
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-desktopDATA uninstall-man uninstall-menuDATA
+
+uninstall-man: uninstall-man1
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-desktopDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-man1 install-menuDATA install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-desktopDATA uninstall-man \
+	uninstall-man1 uninstall-menuDATA
+
+@INTLTOOL_DESKTOP_RULE@
+
+@DEBIAN_MENU_TRUE@$(MENU_FILES): $(MENU_IN_FILES)
+@DEBIAN_MENU_TRUE@	cp $? $@
+
+clean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES); \
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+# Tell versions 3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

guvcview-src-1.6.1.tar.gz/data/guvcview.1 Changed

guvcview-src-1.6.1.tar.gz/data/guvcview.desktop.in.in Added

guvcview-src-1.6.1.tar.gz/data/guvcview.in.in Added

guvcview-src-1.6.1.tar.gz/data/icons Added

guvcview-src-1.6.1.tar.gz/data/icons/Makefile.am Added

guvcview-src-1.6.1.tar.gz/data/icons/Makefile.in Added

@@ -0,0 +1,440 @@
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = data/icons
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
+  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
+    if (++n$$2 == $(am__install_max)) \
+      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
+    END { for (dir in files) print dir, filesdir }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+DATA = $(icons_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DEPS_CFLAGS = @DEPS_CFLAGS@
+DEPS_LIBS = @DEPS_LIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LIBS = @PULSE_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+iconsdir = ${datadir}/pixmaps/guvcview
+icons_DATA = \
+		guvcview.png\
+		camera.png\
+		movie.png\
+		save.png\
+		defaults.png\
+		image_controls.png\
+		video_controls.png\
+		audio_controls.png\
+		images_folder.png\
+		videos_folder.png\
+		controls_folder.png\
+		close.png
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/pixmaps/guvcview/
+EXTRA_DIST = $(icons_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu data/icons/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-iconsDATA: $(icons_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
+	done
+
+uninstall-iconsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/^/*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/^/*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(iconsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-iconsDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-iconsDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-iconsDATA \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-hook \
+	uninstall-iconsDATA
+
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+# Tell versions 3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

guvcview-src-1.6.1.tar.gz/data/icons/audio_controls.png Changed

guvcview-src-1.6.1.tar.gz/data/icons/camera.png Changed

guvcview-src-1.6.1.tar.gz/data/icons/close.png Changed

guvcview-src-1.6.1.tar.gz/data/icons/controls_folder.png Changed

guvcview-src-1.6.1.tar.gz/data/icons/defaults.png Changed

guvcview-src-1.6.1.tar.gz/data/icons/guvcview.png Changed

guvcview-src-1.6.1.tar.gz/data/icons/image_controls.png Changed

guvcview-src-1.6.1.tar.gz/data/icons/images_folder.png Changed

guvcview-src-1.6.1.tar.gz/data/icons/movie.png Changed

guvcview-src-1.6.1.tar.gz/data/icons/save.png Changed

guvcview-src-1.6.1.tar.gz/data/icons/video_controls.png Changed

guvcview-src-1.6.1.tar.gz/data/icons/videos_folder.png Changed

guvcview-src-1.5.3.tar.gz/depcomp -> guvcview-src-1.6.1.tar.gz/depcomp Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-04.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
 
 # 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
@@ -44,7 +44,7 @@
   object      Object file output by `PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -90,10 +90,18 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -158,10 +166,12 @@
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -405,6 +415,52 @@
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *$.*$/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/$.*$/	\1 \\/p
+s/.$.*$ \\/\1:/
+H
+$ {
+  s/.*/	/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -503,7 +559,9 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile"
   sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation

guvcview-src-1.5.3.tar.gz/install-sh -> guvcview-src-1.6.1.tar.gz/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | =!) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | =!) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | =!) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	-=!*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

guvcview-src-1.6.1.tar.gz/m4/intltool.m4 Added

@@ -0,0 +1,216 @@
+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
+## Copyright (C) 2001 Eazel, Inc.
+## Author: Maciej Stachowiak <mjs@noisehavoc.org>
+##         Kenneth Christiansen <kenneth@gnu.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; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+##
+## As a special exception to the GNU General Public License, if you
+## distribute this file as part of a program that contains a
+## configuration script generated by Autoconf, you may include it under
+## the same distribution terms that you use for the rest of that program.
+
+dnl IT_PROG_INTLTOOL(MINIMUM-VERSION, no-xml)
+# serial 40 IT_PROG_INTLTOOL
+AC_DEFUN(IT_PROG_INTLTOOL, 
+AC_PREREQ(2.50)dnl
+AC_REQUIRE(AM_NLS)dnl
+
+case "$am__api_version" in
+    1.01234)
+	AC_MSG_ERROR(Automake 1.5 or newer is required to use intltool)
+    ;;
+    *)
+    ;;
+esac
+
+if test -n "$1"; then
+    AC_MSG_CHECKING(for intltool >= $1)
+
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    
+    AC_MSG_RESULT($INTLTOOL_APPLIED_VERSION found)
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	AC_MSG_ERROR(Your intltool is too old.  You need intltool $1 or later.)
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, intltool-update)
+AC_PATH_PROG(INTLTOOL_MERGE, intltool-merge)
+AC_PATH_PROG(INTLTOOL_EXTRACT, intltool-extract)
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    AC_MSG_ERROR(The intltool scripts were not found. Please install intltool.)
+fi
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' 
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    AC_MSG_ERROR(GNU gettext tools not found; required for intltool)
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    AC_MSG_ERROR(GNU gettext tools not found; required for intltool)
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+   AC_MSG_ERROR(perl not found)
+fi
+AC_MSG_CHECKING(for perl >= 5.8.1)
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+   AC_MSG_ERROR(perl 5.8.1 is required for intltool)
+else
+   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   AC_MSG_RESULT($IT_PERL_VERSION)
+fi
+if test "x$2" != "xno-xml"; then
+   AC_MSG_CHECKING(for XML::Parser)
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       AC_MSG_RESULT(ok)
+   else
+       AC_MSG_ERROR(XML::Parser perl module is required for intltool)
+   fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  AC_LINK_IFELSE(
+    AC_LANG_PROGRAM(,
+                     extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr),
+    DATADIRNAME=share,
+    case $host in
+    *-*-solaris*)
+    dnl On Solaris, if bind_textdomain_codeset is in libc,
+    dnl GNU format message catalog is always supported,
+    dnl since both are added to the libc all together.
+    dnl Hence, we'd like to go with DATADIRNAME=share
+    dnl in this case.
+    AC_CHECK_FUNC(bind_textdomain_codeset,
+      DATADIRNAME=share, DATADIRNAME=lib)
+    ;;
+    *)
+    DATADIRNAME=lib
+    ;;
+    esac)
+fi
+AC_SUBST(DATADIRNAME)
+
+IT_PO_SUBDIR(po)
+
+)
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN(IT_PO_SUBDIR,
+AC_PREREQ(2.53)dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be executed at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE(
+  AC_CONFIG_COMMANDS($1/stamp-it, 
+    if  ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ; then
+       AC_MSG_ERROR($1/Makefile.in.in was not created by intltoolize.)
+    fi
+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+    >"$1/stamp-it.tmp"
+    sed '/^#/d
+	 s/^.* *//
+	 /^ 	*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+    
+    sed '/^POTFILES =/,/^\\$/ {
+		/^POTFILES =/!d
+		r $1/POTFILES
+	  }
+	 ' "$1/Makefile.in" >"$1/Makefile"
+    rm -f "$1/Makefile.tmp"
+    mv "$1/stamp-it.tmp" "$1/stamp-it"
+  )
+)dnl
+)
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN(_IT_SUBST,
+
+AC_SUBST($1)
+m4_ifdef(_AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($1))
+
+)
+
+# deprecated macros
+AU_ALIAS(AC_PROG_INTLTOOL, IT_PROG_INTLTOOL)
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN(AC_PROG_INTLTOOL, ...)
+

guvcview-src-1.5.3.tar.gz/missing -> guvcview-src-1.6.1.tar.gz/missing Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.ch', if possible, from existing .ch
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.

guvcview-src-1.5.3.tar.gz/po/Makefile.in.in -> guvcview-src-1.6.1.tar.gz/po/Makefile.in.in Changed

@@ -1,90 +1,94 @@
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
 #
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
 # but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
 #
 # - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
 #   instead of PACKAGE and to look for po2tbl in ./ not in intl/
 #
 # - Modified by jacob berkman <jacob@ximian.com> to install
 #   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
 
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
 SHELL = @SHELL@
-@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
 VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datarootdir = @datarootdir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
 subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdir_p@.
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
 
-CC = @CC@
-GENCAT = @GENCAT@
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
 XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
 
-INCLUDES = -I.. -I$(top_srcdir)/intl
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
-SOURCES = 
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = LINGUAS ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
-$(POFILES) $(GMOFILES) $(SOURCES)
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
+# This comment gets stripped out
 
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
 
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+XGETTEXT_KEYWORDS = --keyword --keyword=N_
 
-.c.o:
-	$(COMPILE) $<
+.SUFFIXES:
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
 
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
 	$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $<
+	file=`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
 	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
+	  && rm -f $@ && gencat $@ $*.msg
 
 
 all: all-@USE_NLS@
@@ -92,148 +96,97 @@
 all-yes: $(CATALOGS)
 all-no:
 
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
-	  --add-comments --keyword=_ --keyword=N_ \
-	  --keyword=C_:1c,2 \
-	  --keyword=NC_:1c,2 \
-	  --keyword=g_dngettext:2,3 \
-	  --flag=N_:1:pass-c-format \
-	  --flag=C_:2:pass-c-format \
-	  --flag=NC_:2:pass-c-format \
-	  --flag=g_dngettext:2:pass-c-format \
-          --flag=g_strdup_printf:1:c-format \
-          --flag=g_string_printf:2:c-format \
-          --flag=g_string_append_printf:2:c-format \
-          --flag=g_error_new:3:c-format \
-          --flag=g_set_error:4:c-format \
-          --flag=g_markup_printf_escaped:1:c-format \
-          --flag=g_log:3:c-format \
-          --flag=g_print:1:c-format \
-          --flag=g_printerr:1:c-format \
-          --flag=g_printf:1:c-format \
-          --flag=g_fprintf:2:c-format \
-          --flag=g_sprintf:2:c-format \
-          --flag=g_snprintf:3:c-format \
-          --flag=g_scanner_error:2:c-format \
-          --flag=g_scanner_warn:2:c-format \
-	  --files-from=$(srcdir)/POTFILES.in \
-	&& test ! -f $(GETTEXT_PACKAGE).po \
-	   || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
-		&& mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
-
-install: install-exec install-data
-install-exec:
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+	$(GENPOT)
+
+install: install-data
 install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
-	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
-	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
-	fi
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-	  fi; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $$dir; \
+	  if test -r $$lang.gmo; then \
+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
 	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$lang.gmo as" \
+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
 	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+	  if test -r $$lang.gmo.m; then \
+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	    else \
 	      true; \
 	    fi; \
 	  fi; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
+
+# Empty stubs to satisfy archaic automake needs
+dvi info ctags tags CTAGS TAGS ID:
 
 # Define this as empty until I found a useful application.
-installcheck:
+install-exec installcheck:
 
 uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	fi
-
-check: all
 
-dvi info tags TAGS ID:
+check: all $(GETTEXT_PACKAGE).pot
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if  -r missing -o -r notexist ; then \
+	  exit 1; \
+	fi
 
 mostlyclean:
-	rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
-	rm -fr *.o
+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+	rm -f .intltool-merge-cache
 
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.gmo *.msg *.cat *.cat.m
+	rm -f Makefile Makefile.in POTFILES stamp-it
+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
+	rm -f Makefile.in.in
 
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
 	dists="$(DISTFILES)"; \
+	extra_dists="$(EXTRA_DISTFILES)"; \
+	for file in $$extra_dists; do \
+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	done; \
 	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
+	  test -f $$file || file="$(srcdir)/$$file"; \
+	  ln $$file $(distdir) 2> /dev/null \
+	    || cp -p $$file $(distdir); \
 	done
 
 update-po: Makefile
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	tmpdir=`pwd`; \
-	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
 	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \
-	    if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+	  if $$result; then \
+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	      rm -f $$tmpdir/$$lang.new.po; \
             else \
 	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
@@ -245,32 +198,21 @@
 	      fi; \
 	    fi; \
 	  else \
-	    echo "msgmerge for $$cat failed!"; \
+		echo "msgmerge for $$lang.gmo failed!"; \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  fi; \
 	done
 
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' 						\
-		    -e "s/^\.*\ +//" 					\
-		    -e '/^ 	*$$/d' 				\
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
-	  && $(SHELL) ./config.status $(subdir)/$@.in
+Makefile POTFILES: stamp-it
+	@if test ! -f $@; then \
+	  rm -f stamp-it; \
+	  $(MAKE) stamp-it; \
+	fi
+
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+	       $(SHELL) ./config.status
 
 # Tell versions 3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

guvcview-src-1.5.3.tar.gz/po/Makevars -> guvcview-src-1.6.1.tar.gz/po/Makevars Changed

guvcview-src-1.5.3.tar.gz/po/POTFILES.in -> guvcview-src-1.6.1.tar.gz/po/POTFILES.in Changed

guvcview-src-1.6.1.tar.gz/po/POTFILES.skip Added

guvcview-src-1.5.3.tar.gz/po/bs.po -> guvcview-src-1.6.1.tar.gz/po/bs.po Changed

@@ -6,27 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2011-06-27 19:11+0000\n"
 "Last-Translator: Stefan Ivanović <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
 "X-Generator: Launchpad (build 14868)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "GUVCVju Snimanje video zapisa"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "GUVCVjuer Kontrole"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -36,7 +37,7 @@
 "\n"
 "Nije moguće otvoriti uređaj"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -45,7 +46,7 @@
 "i da su pravi upravljački programi instalirani."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -55,12 +56,12 @@
 "\n"
 "UVC Kontrola dodataka"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "Kontrola dodataka je dodata na UVC drajver"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -70,7 +71,7 @@
 "\n"
 "UVC kontrola dodataka"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -80,894 +81,929 @@
 "dodataka na UVC drajver\n"
 "Morate pokrenuti GUVCVju kao korjen ili sudo"
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Can't set a valid video stream for guvcview"
 msgstr ""
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
 msgstr ""
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to start with minimum setup"
 msgstr ""
+"GUVCVju greška:\n"
+"\n"
+"Nije moguće otvoriti uređaj"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr ""
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Couldn't query device capabilities"
 msgstr ""
+"GUVCVju greška:\n"
+"\n"
+"Nije moguće otvoriti uređaj"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr ""
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Read method error"
 msgstr ""
+"GUVCVju greška:\n"
+"\n"
+"Nije moguće otvoriti uređaj"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr ""
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to allocate Buffers"
 msgstr ""
+"GUVCVju greška:\n"
+"\n"
+"Nije moguće otvoriti uređaj"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr ""
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr ""
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr ""
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr ""
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr ""
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr ""
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr ""
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr ""
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr ""
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to create Video Thread"
 msgstr ""
+"GUVCVju greška:\n"
+"\n"
+"Nije moguće otvoriti uređaj"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
+#, fuzzy
 msgid "User Controls"
-msgstr ""
+msgstr "GUVCVjuer Kontrole"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr ""
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr ""
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr ""
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr ""
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr ""
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr ""
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr ""
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr ""
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr ""
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr ""
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr ""
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr ""
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr ""
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr ""
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
+#, fuzzy
 msgid "Camera Controls"
-msgstr ""
+msgstr "GUVCVjuer Kontrole"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr ""
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr ""
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr ""
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr ""
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr ""
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr ""
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr ""
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr ""
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr ""
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr ""
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr ""
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr ""
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr ""
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr ""
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr ""
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr ""
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr ""
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr ""
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr ""
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr ""
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr ""
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr ""
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr ""
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr ""
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr ""
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr ""
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr ""
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr ""
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr ""
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr ""
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr ""
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr ""
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr ""
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr ""
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr ""
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr ""
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr ""
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr ""
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr ""
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr ""
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr ""
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr ""
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr ""
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr ""
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr ""
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr ""
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr ""
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr ""
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr ""
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr ""
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr ""
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr ""
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr ""
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr ""
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr ""
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr ""
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr ""
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr ""
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 msgid "Auto"
 msgstr ""
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
 msgid "Pan Reset"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
 msgid "Tilt Reset"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr ""
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr ""
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr ""
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr ""
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr ""
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr ""
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr ""
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr ""
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr ""
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr ""
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr ""
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr ""
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr ""
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr ""
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr ""
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
-"Pixel "
-"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
-"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr ""
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr ""
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr ""
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr ""
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr ""
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr ""
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr ""
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr ""
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr ""
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr ""
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr ""
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr ""
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr ""
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr ""
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr ""
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr ""
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr ""
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
 msgstr ""
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr ""
+
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""

guvcview-src-1.5.3.tar.gz/po/cs.po -> guvcview-src-1.6.1.tar.gz/po/cs.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2009-11-16 01:36+0000\n"
 "Last-Translator: exxxo45 <exxxo45@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -18,16 +18,16 @@
 "X-Launchpad-Export-Date: 2011-01-19 14:28+0000\n"
 "X-Generator: Launchpad (build 12214)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr ""
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "Ovládání GUVCViewer"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -37,7 +37,7 @@
 "\n"
 "Nelze otevřít zařízení"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -46,7 +46,7 @@
 "a že máte nainstalován správný ovladač."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -56,12 +56,12 @@
 "\n"
 "Rozšířené ovládání UVC"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "Rozšířené ovládání bylo přidáno do UVC ovladače"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -71,7 +71,7 @@
 "\n"
 "Rozšířené ovládání UCV"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -81,14 +81,18 @@
 "ovládání do ovladače UVC\n"
 "Ujistěte se, že spouštíte guvcview jako root (či sudo)."
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Can't set a valid video stream for guvcview"
 msgstr ""
+"ChybaGuvcview:\n"
+"\n"
+"Nelze nastavit MJPG nebo YUV proud pro guvcview"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -96,7 +100,7 @@
 "Ujistěte se, že ovladač vašeho přístroje je kompatibilní s v4|2\n"
 "a že je správně nainstalován."
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -106,22 +110,26 @@
 "\n"
 "Nelze spustit minimální konfguraci"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Prosím připojte znovu kameru."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Couldn't query device capabilities"
 msgstr ""
+"ChybaGuvcview:\n"
+"\n"
+"Nelze otevřít zařízení"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Ujistěte se, že ovladač zařízení podporuje v4l2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -131,11 +139,11 @@
 "\n"
 "Chyba metody čtení"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "Místo (--capture_method=1) zkuste mmap."
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -145,48 +153,48 @@
 "\n"
 "Nelze alokovat Buffery"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Prosím zkuste restartovat váš systém."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Ovládání obrazů"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Zaznamenat:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Ovládací profily:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr ""
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Zastavit automat"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Zazn. Obraz"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Zastavit Video"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Zazn. Video"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -196,695 +204,717 @@
 "\n"
 "Nelze založit vlákno videa"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr "Prosím nahlašte to na http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "Uživatelká nastavení"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Jas"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Odstín"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Sytost"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Ostrost"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Komponzace podsvětlení"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "Kmitočet sítě"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "Odstín, Automatický"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Ostření, Auto"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Ruční mód"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Auto. mód"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Mód priority clony"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
+#, fuzzy
 msgid "Aperture Priority Mode"
-msgstr ""
+msgstr "Mód priority clony"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Úroveň černé"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Vyvážení bílé"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "Vyvážit bílou"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Vyvážení červené"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Vyvážení modré"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Expozice"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
+#, fuzzy
 msgid "Gain, Automatic"
-msgstr ""
+msgstr "Odstín, Automatický"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Zisk"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Horizontální překlopení"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Vertikální překlopení"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "Horizontální střed"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "Vertikální střed"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr "Odstranění barvy"
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Barevné efekty"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "Ovládání kamery"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Automatická korekce závěrky"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
+#, fuzzy
 msgid "Exposure Time, Absolute"
-msgstr ""
+msgstr "Expozice (Absolutní)"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
+#, fuzzy
 msgid "Pan, Relative"
-msgstr ""
+msgstr "Záběr (relativní)"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
+#, fuzzy
 msgid "Tilt, Relative"
-msgstr ""
+msgstr "Záběr (relativní)"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
+#, fuzzy
 msgid "Pan, Reset"
-msgstr ""
+msgstr "Reset záběru"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
+#, fuzzy
 msgid "Tilt, Reset"
-msgstr ""
+msgstr "Obnovit"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
+#, fuzzy
 msgid "Focus, Absolute"
-msgstr ""
+msgstr "Ostření (absolutní)"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
+#, fuzzy
 msgid "Focus, Relative"
-msgstr ""
+msgstr "Zaostření, Automaticky"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Zaostření, Automaticky"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
+#, fuzzy
 msgid "Zoom, Absolute"
-msgstr ""
+msgstr "Expozice (Absolutní)"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
+#, fuzzy
 msgid "Zoom, Relative"
-msgstr ""
+msgstr " Negativ"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
+#, fuzzy
 msgid "Zoom, Continuous"
-msgstr ""
+msgstr "Automatické ostření (pozvolné)"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr ""
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Expozive, Auto"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Expozice Auto. prorita"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Expozice (Absolutní)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Vyvážení bílé, Auto"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Vyvážení bílé"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Komponenta vyvážení bílé, Auto"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
+#, fuzzy
 msgid "White Balance Blue Component"
-msgstr ""
+msgstr "Komponenta vyvážení bílé, Auto"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
+#, fuzzy
 msgid "White Balance Red Component"
-msgstr ""
+msgstr "Komponenta vyvážení bílé, Auto"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Zaostření"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
+#, fuzzy
 msgid "Focus (Absolute)"
-msgstr ""
+msgstr "Ostření (absolutní)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Uložit soubor"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "Číslo souboru:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr ""
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr ""
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Video & Soubory"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Zařízení:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Snímkový kmitočet"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Zobrazit"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Rozlišení:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Výstup kamery:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Použít"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Kvalita:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Soubor obrazu:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "Soubor, Auto"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Formát obrazu:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "Video soubor:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Kodek videa:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "vlastnosti"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Formát videa:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Filtry videa ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Zrcadlo"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Invertovat"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Negativ"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Mono"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr ""
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr ""
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Zvuk"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Zvuk"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr ""
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "PORTAUDIO"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Vstupní zařízení:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Výchozí zařízení"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr ""
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Kanály:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Formát zvuku:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Zvukové efekty ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Zobrazit"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr ""
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Ozvěna"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " WahWah"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr ""
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Vlevo"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Vpravo"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Dolů"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Nahoru"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "Zastavit automat"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
+#, fuzzy
 msgid "Pan (relative)"
 msgstr "Záběr (relativní)"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
+#, fuzzy
 msgid "Tilt (relative)"
 msgstr "Záběr (relativní)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
+#, fuzzy
 msgid "Pan Reset"
 msgstr "Reset záběru"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
+#, fuzzy
 msgid "Tilt Reset"
 msgstr "Obnovit"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "Reset záběru"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
+#, fuzzy
 msgid "Focus (absolute)"
 msgstr "Ostření (absolutní)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "Mód LED1"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "Frekvence LED1"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "Zakázat zpracování videa"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Raw bity / pxel"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - komprimovaný"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - uncomp YUV"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - uncomp BMP"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG video 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - flash video 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr ""
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - formát MPG2"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr ""
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr ""
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "Vypíše verzi"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Zobrazí ladící informace"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Video zařízení výchozí /dev/video0"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "Konfigurační soubor"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "Hardwarová akcelerace (povolit(1) | zakázat(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
@@ -892,86 +922,86 @@
 "Formát pixelu (mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Velikost rámce, výchozí: 640x480"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Název souboru orazu"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "Interval snímání v sekundách"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Počet obrázků k zaznamenání"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "Jméno Video souboru (záznam od začátku)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "Čas Video záznamu (v sekundách)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr "Počet prvních vynechaných snímků"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "Zobrazit hodnotu FPS (povolit(1) | zakázat(0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Načíst profil při spuštění"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- místní nastavení"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Automatické ostření (pozvolné)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "nastavit Ostření"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr ""
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "spustit nový"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "restart"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "nový"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "zrušit"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -979,26 +1009,29 @@
 "Spustit nový proces nebo restartovat?.\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Nahrát soubor"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "Na disku nezbývá dost volného místa"
 
-#~ msgid ""
-#~ "Guvcview error:\n"
-#~ "\n"
-#~ "Can't set MJPG or YUV stream for guvcview"
-#~ msgstr ""
-#~ "ChybaGuvcview:\n"
-#~ "\n"
-#~ "Nelze nastavit MJPG nebo YUV proud pro guvcview"
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
 
 #~ msgid ""
 #~ "Make sure you have a UVC compliant camera\n"

guvcview-src-1.5.3.tar.gz/po/da.po -> guvcview-src-1.6.1.tar.gz/po/da.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2009-09-15 03:36+0000\n"
 "Last-Translator: Paulo Assis <pj.assis@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -18,16 +18,16 @@
 "X-Launchpad-Export-Date: 2009-11-15 23:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr ""
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "GUVCViewer kontroller"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -37,53 +37,57 @@
 "\n"
 "Kunne ikke åbne udstyr"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
 msgstr ""
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr ""
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
+"Guvcview fejl:\n"
+"\n"
+"Kunne ikke åbne udstyr"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
 "Make sure you run guvcview as root (or sudo)."
 msgstr ""
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Can't set a valid video stream for guvcview"
 msgstr ""
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
 msgstr ""
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -93,81 +97,93 @@
 "\n"
 "Kunne ikke starte på minimum setup"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Vær venlig at gentilslutte dit kamera."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Couldn't query device capabilities"
 msgstr ""
+"Guvcview fejl:\n"
+"\n"
+"Kunne ikke åbne udstyr"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr ""
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Read method error"
 msgstr ""
+"Guvcview fejl:\n"
+"\n"
+"Kunne ikke åbne udstyr"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr ""
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to allocate Buffers"
 msgstr ""
+"Guvcview fejl:\n"
+"\n"
+"Kunne ikke åbne udstyr"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Prøv venligst at genstarte dit system."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Billed kontroller"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr ""
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Kontrol profiler:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr ""
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Stop auto"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr ""
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Stop Video"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr ""
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -177,808 +193,847 @@
 "\n"
 "Kunne ikke skabe video tråd"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 "Rapporter det venligst til http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
+#, fuzzy
 msgid "User Controls"
-msgstr ""
+msgstr "GUVCViewer kontroller"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Lysstyrke"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Farvetone"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Farvemætning"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Skarphed"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Baglys kompensation"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
+#, fuzzy
 msgid "Power Line Frequency"
-msgstr ""
+msgstr "LED1 frekvens"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Fokus, auto"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Manuel tilstand"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Auto tilstand"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr ""
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
+#, fuzzy
 msgid "White Balance, Automatic"
-msgstr ""
+msgstr "Hvid balance komponent, auto"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
+#, fuzzy
 msgid "Do White Balance"
-msgstr ""
+msgstr "Hvid balance temperatur"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
+#, fuzzy
 msgid "Exposure"
-msgstr ""
+msgstr "Eksponering:"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Forhøjelse"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr ""
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr ""
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr ""
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
+#, fuzzy
 msgid "Camera Controls"
-msgstr ""
+msgstr "Billed kontroller"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
+#, fuzzy
 msgid "Auto Exposure"
-msgstr ""
+msgstr "Eksponering:"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
+#, fuzzy
 msgid "Pan, Relative"
-msgstr ""
+msgstr " Negativ"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
+#, fuzzy
 msgid "Tilt, Relative"
-msgstr ""
+msgstr " Negativ"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
+#, fuzzy
 msgid "Pan, Reset"
-msgstr ""
+msgstr "Nulstil"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
+#, fuzzy
 msgid "Tilt, Reset"
-msgstr ""
+msgstr "Nulstil"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
+#, fuzzy
 msgid "Focus, Absolute"
-msgstr ""
+msgstr "Fokus (absolut)"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
+#, fuzzy
 msgid "Focus, Relative"
-msgstr ""
+msgstr "Fokus, auto"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
+#, fuzzy
 msgid "Focus, Automatic"
-msgstr ""
+msgstr "Fokus, auto"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
+#, fuzzy
 msgid "Zoom, Absolute"
-msgstr ""
+msgstr "Fokus (absolut)"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
+#, fuzzy
 msgid "Zoom, Relative"
-msgstr ""
+msgstr " Negativ"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
+#, fuzzy
 msgid "Zoom, Continuous"
-msgstr ""
+msgstr "Auto fokus (fortsat)"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr ""
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
+#, fuzzy
 msgid "Exposure, Auto"
-msgstr ""
+msgstr "Eksponering:"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr ""
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
+#, fuzzy
 msgid "Exposure (Absolute)"
-msgstr ""
+msgstr "Fokus (absolut)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Hvid balance temperatur, auto"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Hvid balance temperatur"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Hvid balance komponent, auto"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "Hvid balance blå komponent"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "Hvid balance rød komponent"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
+#, fuzzy
 msgid "Focus"
-msgstr ""
+msgstr "sæt fokus"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
+#, fuzzy
 msgid "Focus (Absolute)"
-msgstr ""
+msgstr "Fokus (absolut)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Gem fil"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "Fil nummer:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr ""
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr ""
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Video & filer"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Input udstyr:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Billedrate:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Vis"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Opløsning:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Kamera output:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr ""
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr ""
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Billed fil:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "Fil, auto"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Billed format:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "Video filer:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr ""
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr ""
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr ""
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Video filtre ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Spejl"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Vend"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Negativ"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Mono"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr ""
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr ""
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr ""
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Lyd"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr ""
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Input udstyr:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr ""
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr ""
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Lyd format:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr ""
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr ""
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr ""
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr ""
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr ""
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr ""
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Venstre"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Højre"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Ned"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Op"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "Stop auto"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
+#, fuzzy
 msgid "Pan (relative)"
-msgstr ""
+msgstr " Negativ"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
+#, fuzzy
 msgid "Tilt (relative)"
-msgstr ""
+msgstr " Negativ"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
+#, fuzzy
 msgid "Pan Reset"
-msgstr ""
+msgstr "Nulstil"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
+#, fuzzy
 msgid "Tilt Reset"
-msgstr ""
+msgstr "Nulstil"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
+#, fuzzy
 msgid "Pan/tilt Reset"
-msgstr ""
+msgstr "Nulstil"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
+#, fuzzy
 msgid "Focus (absolute)"
 msgstr "Fokus (absolut)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "LED1 tilstand"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
+#, fuzzy
 msgid "LED1 Frequency"
 msgstr "LED1 frekvens"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "Slå video processer fra"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Rå bits pr. pixel"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - komprimeret"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - ukomprimeret YUV"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - ukomprimeret BMP"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr ""
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr ""
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr ""
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr ""
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr ""
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr ""
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr ""
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Vis debug information"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Video udstyr at benyttet default: /dev/video0"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr ""
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr ""
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Ramme størrelse, standard: 640x480"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Billedfil navn"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr ""
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr ""
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr ""
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr ""
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr ""
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr ""
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Indlæs profil ved start"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- lokale valgmuligheder"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Auto fokus (fortsat)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "sæt fokus"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 #, fuzzy
 msgid "Error"
 msgstr " Spejl"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr ""
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr ""
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr ""
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr ""
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
 msgstr ""
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Indlæs fil"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr ""
 
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
+
 #~ msgid "PCM"
 #~ msgstr "PCM"
 
 #~ msgid "MP2"
 #~ msgstr "MP2"
 
-#~ msgid "Reset"
-#~ msgstr "Nulstil"
-
 #~ msgid "AVI File:"
 #~ msgstr "AVI fil:"
 
@@ -1005,8 +1060,5 @@
 #~ "\n"
 #~ "Genstart nu?\n"
 
-#~ msgid "Exposure:"
-#~ msgstr "Eksponering:"
-
 #~ msgid "Program Restart"
 #~ msgstr "Genstart program"

guvcview-src-1.5.3.tar.gz/po/de.po -> guvcview-src-1.6.1.tar.gz/po/de.po Changed

@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2009-09-15 03:30+0000\n"
 "Last-Translator: Paulo Assis <pj.assis@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -21,16 +21,16 @@
 "X-Launchpad-Export-Date: 2009-11-15 23:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr ""
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "GUVCViewer Kontrollen"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -40,7 +40,7 @@
 "\n"
 "Das Gerät konnte nicht geöffnet werden"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -49,33 +49,37 @@
 "und dass die driver angebracht ist."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr ""
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
+"Guvcview Fehler:\n"
+"\n"
+"Konnte keine Puffer anlegen"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
 "Make sure you run guvcview as root (or sudo)."
 msgstr ""
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -85,7 +89,7 @@
 "\n"
 "Konnte weder video initialisieren"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -93,7 +97,7 @@
 "Stellen Sie bitte sicher, dass Sie sowohl eine v4l2 kompatible Kamera "
 "besitzen als auch den Treiber geladen haben."
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -103,11 +107,11 @@
 "\n"
 "Konnte nicht im minimalen Modus starten"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Bitte schließen Sie Ihre Kamera erneut an."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -117,22 +121,26 @@
 "\n"
 "Das Gerät konnte nicht geöffnet werden"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr ""
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Read method error"
 msgstr ""
+"Guvcview Fehler:\n"
+"\n"
+"Das Gerät konnte nicht geöffnet werden"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr ""
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -142,49 +150,49 @@
 "\n"
 "Konnte keine Puffer anlegen"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Bitte System neu starten."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Bildkontrollen"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Aufnahme:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Kontrollen:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 #, fuzzy
 msgid "Defaults"
 msgstr "Standard"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Automatisch anhalten"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Bild aufnehmen"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Video stoppen"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Video aufnehmen"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -194,697 +202,724 @@
 "\n"
 "Der Video-Thread konnte nicht erzeugt werden"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 "Bitte melden Sie dies an http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
+#, fuzzy
 msgid "User Controls"
-msgstr ""
+msgstr "GUVCViewer Kontrollen"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Helligkeit"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Farbe"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Sättigung"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Schärfe"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Korrektur der Hintergrundbeleuchtung"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "Netzfrequenz"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
+#, fuzzy
 msgid "Hue, Automatic"
-msgstr ""
+msgstr "Farbe, Automatisch"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Fokus, Automatisch"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Händischer Modus"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Automatischer Modus"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Blendenautomatik-Modus"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "Blendenpriorität-Modus"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr ""
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
+#, fuzzy
 msgid "White Balance, Automatic"
-msgstr ""
+msgstr "Automatischer Weißabgleich (Komponente)"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
+#, fuzzy
 msgid "Do White Balance"
-msgstr ""
+msgstr "Weißabgleich (Temperatur)"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
+#, fuzzy
 msgid "Exposure"
-msgstr ""
+msgstr "Belichtung:"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Gewinn"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr ""
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr ""
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr ""
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
+#, fuzzy
 msgid "Camera Controls"
-msgstr ""
+msgstr "Bildkontrollen"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
+#, fuzzy
 msgid "Auto Exposure"
-msgstr ""
+msgstr "Belichtung:"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
+#, fuzzy
 msgid "Exposure Time, Absolute"
-msgstr ""
+msgstr "Belichtung (Absolut)"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
+#, fuzzy
 msgid "Pan, Relative"
-msgstr ""
+msgstr "Umdrehung (relativ)"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
+#, fuzzy
 msgid "Tilt, Relative"
-msgstr ""
+msgstr "Neigung (relativ)"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
+#, fuzzy
 msgid "Pan, Reset"
-msgstr ""
+msgstr "Umdrehung (Zurückstellen)"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
+#, fuzzy
 msgid "Tilt, Reset"
-msgstr ""
+msgstr "Neigung (Zurückstellen)"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
+#, fuzzy
 msgid "Focus, Absolute"
-msgstr ""
+msgstr "Fokus (absolut)"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
+#, fuzzy
 msgid "Focus, Relative"
-msgstr ""
+msgstr "Fokus, Automatisch"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
+#, fuzzy
 msgid "Focus, Automatic"
-msgstr ""
+msgstr "Fokus, Automatisch"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
+#, fuzzy
 msgid "Zoom, Absolute"
-msgstr ""
+msgstr "Belichtung (Absolut)"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
+#, fuzzy
 msgid "Zoom, Relative"
-msgstr ""
+msgstr " Negativ"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
+#, fuzzy
 msgid "Zoom, Continuous"
-msgstr ""
+msgstr "Automatisch Fokus (con.)"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr ""
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Belichtung, Automatisch"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Belichtung, automatische Priorität"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Belichtung (Absolut)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Automatischer Weißabgleich (Temperatur)"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Weißabgleich (Temperatur)"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Automatischer Weißabgleich (Komponente)"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "Weißabgleich (Blau)"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "Weißabgleich (Rot)"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
+#, fuzzy
 msgid "Focus"
-msgstr ""
+msgstr "Fokus"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
+#, fuzzy
 msgid "Focus (Absolute)"
-msgstr ""
+msgstr "Fokus (absolut)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Datei speichern"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "Dateinummer:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr ""
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr ""
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Video & Dateien"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Eingabegerät:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Bildrate:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Anzeigen"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Auflösung:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Kamera-BIld:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr ""
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr ""
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Bilddatei:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "Datei,Automatisch"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Bildformat:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "Video Datei:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr ""
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr ""
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Video-Format:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Videofilter ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Gespiegelt"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Gedreht"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Negativ"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Monochrom"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr ""
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr ""
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr ""
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Audio"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "Audio API:"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Eingabegerät:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Standard"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "Frequenz:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - Mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - Stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Kanäle:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Audio-Format:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Audiofilter ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Echo"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr ""
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr ""
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr ""
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr ""
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Links"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Rechts"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Runter"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Hoch"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "Automatisch anhalten"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
+#, fuzzy
 msgid "Pan (relative)"
 msgstr "Umdrehung (relativ)"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
+#, fuzzy
 msgid "Tilt (relative)"
 msgstr "Neigung (relativ)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
+#, fuzzy
 msgid "Pan Reset"
 msgstr "Umdrehung (Zurückstellen)"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
+#, fuzzy
 msgid "Tilt Reset"
 msgstr "Neigung (Zurückstellen)"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "Umdrehung/Neigung (Zurückstellen)"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
+#, fuzzy
 msgid "Focus (absolute)"
 msgstr "Fokus (absolut)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "Modus LED1"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "Frequenz LED1"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "Deaktiviere Videoverarbeitung"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Rohe Bits pro Pixel"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - komprimiert"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - keine Komp. YUV"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - keine Komp. BMP"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr ""
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr ""
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr ""
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr ""
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr ""
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 #, fuzzy
 msgid "MPEG4-ASP"
 msgstr "MPEG"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr ""
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Extra Informationen anzeigen"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Videovorrichtung (/dev/video0)"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "Konfigurationsdatei"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "Hardware accel. (aktivieren(1) | inaktivieren(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
 #, fuzzy
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
@@ -893,87 +928,88 @@
 "Videoformat(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|"
 "grey|s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Auflösung (def. 640x480)"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Bilddatei"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "Bild aufnehmenabgelaufen (sekunden)"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Bildquantität"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "Datei video (anfangaufnehmen)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "Videodauer  (sekunden)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
+#, fuzzy
 msgid "Number of initial frames to skip"
-msgstr ""
+msgstr "Bildquantität"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "FPS anzeigen (aktivieren(1)|inaktivieren(0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "kontrollen - Datei öffnen"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- lokale Wahlen"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Automatisch Fokus (con.)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "Fokus"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 #, fuzzy
 msgid "Error"
 msgstr " Gespiegelt"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "beginnen neue"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "Neustart"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "Neue"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "Abbrechen"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -981,18 +1017,30 @@
 "Neuer prozess oder programm neustarten?\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Datei öffnen"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr ""
 
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
+
 #~ msgid "PCM"
 #~ msgstr "PCM"
 
@@ -1017,12 +1065,6 @@
 #~ msgid "AVI Format:"
 #~ msgstr "AVI-Format:"
 
-#~ msgid "Hue, Auto"
-#~ msgstr "Farbe, Automatisch"
-
-#~ msgid "Exposure:"
-#~ msgstr "Belichtung:"
-
 #~ msgid "Program Restart"
 #~ msgstr "Programm Neustarten"

guvcview-src-1.5.3.tar.gz/po/es.po -> guvcview-src-1.6.1.tar.gz/po/es.po Changed

@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2011-01-09 05:42+0000\n"
 "Last-Translator: Fitoschido <fitoschido@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -20,16 +20,16 @@
 "X-Launchpad-Export-Date: 2011-01-19 14:28+0000\n"
 "X-Generator: Launchpad (build 12214)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Captura de vídeo Guvcview"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "Controles de GUVCViewer"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -39,7 +39,7 @@
 "\n"
 "No se pudo abrir el dispositivo"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -48,7 +48,7 @@
 "y que se instaló el controlador correcto."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -58,12 +58,12 @@
 "\n"
 "Controles de la extensión UVC"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "Los controles de extensión se añadieron al controlador de UVC"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -73,7 +73,7 @@
 "\n"
 "Controles de extensión UVC"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -83,7 +83,7 @@
 "de extensión al controlador UVC\n"
 "Asegúrese de que ejecuta guvcview como root (o sudo)."
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -93,7 +93,7 @@
 "\n"
 "Incapaz de establecer video stream"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -101,7 +101,7 @@
 "Asegúrese de que tiene un controlador v4l2\n"
 "y que está instalado."
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -111,11 +111,11 @@
 "\n"
 "No se pudo iniciar con la configuración mínima"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Vuelva a conectar su cámara."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -125,11 +125,11 @@
 "\n"
 "No se pudo abrir el dispositivo"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Asegúrese de que el controlador del dispositivo soporta v4l2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -139,11 +139,11 @@
 "\n"
 "error de método Read"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "Intente, en vez de eso, mmap (--capture_method=1)."
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -153,48 +153,48 @@
 "\n"
 "No se pudieron asignar búferes"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Pruebe a reiniciar su sistema."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Controles de la imagen"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Captura:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Perfiles de control:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "Predeterminados"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Detener auto"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Cap. imagen"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Detener vídeo"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Cap. vídeo"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -204,782 +204,797 @@
 "\n"
 "No se pudo crear hilo de vídeo"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr "Repórtelo a http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "Controles de usuario"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Brillo"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Matiz"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Saturación"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Nitidez"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Compensación de retroiluminación"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "Frecuencia de la línea eléctrica"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "Matiz, automático"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Foco, Auto"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Modo manual"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Modo automático"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Modo prioridad del obturador"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "Modo prioridad de la abertura"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Nivel de negros"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Balance de blancos, automático"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "Hacer balance de blancos"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Balance de rojos"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Balance de azules"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Exposición"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "Ganancia, automático"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Ganancia"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Giro horizontal"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Giro vertical"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "Centrado horizontal"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "Centrado vertical"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr "AGC de croma"
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr "Anulador de color"
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Efectos de color"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "Controles de cámara"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Exposición automática"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "Tiempo de exposición, absoluto"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr "Exposición, tasa de fotogramas dinámica"
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
+#, fuzzy
 msgid "Pan, Relative"
-msgstr ""
+msgstr "Rotación (relativo)"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
+#, fuzzy
 msgid "Tilt, Relative"
-msgstr ""
+msgstr "Inclinación (relativa)"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
+#, fuzzy
 msgid "Pan, Reset"
-msgstr ""
+msgstr "Rotación (reajuste)"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
+#, fuzzy
 msgid "Tilt, Reset"
-msgstr ""
+msgstr "Inclinación (reajuste)"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
+#, fuzzy
 msgid "Pan, Absolute"
-msgstr ""
+msgstr "Zoom, absoluto"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "Enfoque, Absoluto"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "Enfoque, relativo"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Enfoque, automático"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr "Zoom, absoluto"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr "Zoom, relativo"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr "Zoom, continuo"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "Privacidad"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Exposición, auto"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Exposición, Prioridad Auto"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Exposición (Absoluta)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Equilibrio blanco, auto"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Blanco (Temp. de color)"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Componente de color, Auto"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "Componente Azul"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "Componente Rojo"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Enfoque"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr "Enfoque (absoluto)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Guardar Archivo"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "Archivo num:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr "valores de códecs"
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "media de bits:   "
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr "qmáx:   "
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr "qmin:   "
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr "máx. qdiff:   "
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr "tamaño dia:   "
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr "tamaño pre dia:   "
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr "pre me:   "
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr "cmp:   "
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr "tamaño gop:   "
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr "Metodo me   "
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr "mb desición   "
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 #, fuzzy
 msgid "num threads:   "
 msgstr "Metodo me   "
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Video e Archivos"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Dispositivo de entrada:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "FPS:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Mostrar"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Resolución:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Salida de la cámara:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Calidad:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Archivo de Imagen:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "Archivo,Auto"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Formato de Imagen:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "Archivo Video:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Códec de vídeo:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "propiedades"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Formato de Video:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Filtros Video ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Espejo"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Invertido"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Negativo"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Gris"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr " Pedazos"
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr ""
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Audio"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Sonido"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "Audio API"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "PORTAUDIO"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Dispositivo de entrada:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Automático"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "Sample Rate:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Canales:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Formato de Audio:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Efectos de Audio ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Eco"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr " Ruido"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Reverb"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " WahWah"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr " Pato"
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Derecha"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Abajo"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Arriba"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "Detener auto"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
+#, fuzzy
 msgid "Pan (relative)"
 msgstr "Rotación (relativo)"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
+#, fuzzy
 msgid "Tilt (relative)"
 msgstr "Inclinación (relativa)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
+#, fuzzy
 msgid "Pan Reset"
 msgstr "Rotación (reajuste)"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
+#, fuzzy
 msgid "Tilt Reset"
 msgstr "Inclinación (reajuste)"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "Rotación/Inclinación (reajuste)"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr "Foco (absoluto)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "Modo LED1"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "Frecuencia LED1"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "Parar el proceso de vídeo"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Bits por pixel (Raw)"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - comprimido"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - s/comp YUV"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - s/comp BMP"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG video 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - flash video 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - win. med. video 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - MPG2 format"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MS MP4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
+#, fuzzy
 msgid "MPEG4-ASP"
-msgstr ""
+msgstr "MPEG"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "Imprimir versión"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Exhibir information de depuracion"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Dispositivo de video pred: /dev/video0"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 "Salir después de añadir los controles de extensión UVC (requiere root/sudo)"
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr "No hacer streaming de vídeo (sólo controles)"
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr "Método de captura (1-mmap (predeterminado) 2-read)"
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "Archivo de configuración"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "Accel. del hardware (habilitar(1)|deshabil.(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
+#, fuzzy
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
+"Formato(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|"
+"grey|s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Resolución (defect: 640x480)"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Archivo de Imagen"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "Intervalo de captura Imagen en segundos"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Número de imagens a capturar"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "Archivo video (captura del arranque)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "Tiempo de la captura video (segundos)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr "Salir de guvcview después de cerrar el vídeo"
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr "Número de fotogramas iniciales a omitir"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "Exhibir FPS (habilitar(1) | deshabilitar(0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Cargar perfil al inicio"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- opciones locales"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Foco Automatico (continuo)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "Focar"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr ""
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "Comenzar nuevo"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "Recomenzar aplicación"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "nuevo"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "cancelar"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -987,18 +1002,30 @@
 "nuevo proceso o recomenzar?\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Cargar Archivo"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr "Aviso de Guvcview:"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "No hay suficiente espacio libre en disco"
 
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
+
 #~ msgid ""
 #~ "Please make sure the camera is connected\n"
 #~ "and that the linux-UVC driver is installed."
@@ -1075,9 +1102,6 @@
 #~ "\n"
 #~ "¿Recomenzar ahora?\n"
 
-#~ msgid "MPEG"
-#~ msgstr "MPEG"
-
 #~ msgid "FLV1"
 #~ msgstr "FLV1"
 
@@ -1098,13 +1122,6 @@
 #~ msgid "MPEG4 - MPEG4 format"
 #~ msgstr "MPEG4 - MPEG4 format"
 
-#~ msgid ""
-#~ "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
-#~ "y41p|grey|s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
-#~ msgstr ""
-#~ "Formato(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|"
-#~ "grey|s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
-
 #~ msgid "Reset"
 #~ msgstr "Restablecer"

guvcview-src-1.5.3.tar.gz/po/eu.po -> guvcview-src-1.6.1.tar.gz/po/eu.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2009-10-26 21:43+0000\n"
 "Last-Translator: Pablo Zubiaurre <pablozub89@gmail.com>\n"
 "Language-Team: Basque <eu@li.org>\n"
@@ -18,16 +18,16 @@
 "X-Launchpad-Export-Date: 2009-11-15 23:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr ""
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "GUVCViewer kontrolak"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -37,7 +37,7 @@
 "\n"
 "Ez da posible gailua zabaltzea"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -46,7 +46,7 @@
 "eta driver-a instalatuta dagoela"
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -56,12 +56,12 @@
 "\n"
 "UVC luzapenaren kontrolak"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "Luzapen kontrolak UVC kontroladoreari gehitu zaizkio"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -71,14 +71,14 @@
 "\n"
 "UVC luzapenaren kontrolak"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
 "Make sure you run guvcview as root (or sudo)."
 msgstr ""
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -88,7 +88,7 @@
 "\n"
 "Ezin izan da bideo-korrontea ezarri"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -96,7 +96,7 @@
 "Mesedez,egiaztatu v4I2 kontrolatzailea duzula\n"
 "eta instalatuta dagoela."
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -106,22 +106,26 @@
 "\n"
 "Ezin izan da konfigurazio minimoarekin abiarazi"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Mesedez, kamera berriro konektatu"
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Couldn't query device capabilities"
 msgstr ""
+"Gucview errorea:\n"
+"\n"
+"Ez da posible gailua zabaltzea"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Ziurtatu gailuaren kontrolatzaileak v4I2 eusten duela"
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -131,11 +135,11 @@
 "\n"
 "Irakurketametodoaren errorea"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr ""
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -145,828 +149,859 @@
 "\n"
 "Ezin izan dira bufferrak esleitu"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Mesedez saiatu sistema berrabiarazten."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Irudi kontrolak"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Kaptura:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Kontrol-Profilak:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr ""
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr ""
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr ""
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Bideoa gelditu"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr ""
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to create Video Thread"
 msgstr ""
+"Gucview errorea:\n"
+"\n"
+"Ezin izan dira bufferrak esleitu"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
+#, fuzzy
 msgid "User Controls"
-msgstr ""
+msgstr "GUVCViewer kontrolak"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Distira"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Kontrastea"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Ñabardura"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Asetasuna"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Garbitasuna"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr ""
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr ""
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
+#, fuzzy
 msgid "Hue, Automatic"
-msgstr ""
+msgstr "Irabazia, Automatikoa"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Foku automatikoa"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Eskuzko modua"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Modu automatikoa"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Obturadore lehentasun modua"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
+#, fuzzy
 msgid "Aperture Priority Mode"
-msgstr ""
+msgstr "Obturadore lehentasun modua"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Beltz-maila"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Zuri-balantzea,automatikoa"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "Zuri-balantzea egin"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Gorri balantzea"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Urdin balantzea"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Esposizioa"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "Irabazia, Automatikoa"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Irabazia"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Irauli horizontalki"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Irauli bertikalki"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
+#, fuzzy
 msgid "Horizontal Center"
-msgstr ""
+msgstr "Irauli horizontalki"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
+#, fuzzy
 msgid "Vertical Center"
-msgstr ""
+msgstr "Irauli bertikalki"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr ""
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
+#, fuzzy
 msgid "Camera Controls"
-msgstr ""
+msgstr "Irudi kontrolak"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
+#, fuzzy
 msgid "Auto Exposure"
-msgstr ""
+msgstr "Esposizioa"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
+#, fuzzy
 msgid "Pan, Reset"
-msgstr ""
+msgstr "Berrezarri"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
+#, fuzzy
 msgid "Tilt, Reset"
-msgstr ""
+msgstr "Berrezarri"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
+#, fuzzy
 msgid "Focus, Absolute"
-msgstr ""
+msgstr "Foku automatikoa"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
+#, fuzzy
 msgid "Focus, Relative"
-msgstr ""
+msgstr "Foku automatikoa"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
+#, fuzzy
 msgid "Focus, Automatic"
-msgstr ""
+msgstr "Foku automatikoa"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr ""
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr ""
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
+#, fuzzy
 msgid "Exposure, Auto"
-msgstr ""
+msgstr "Esposizioa"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr ""
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr ""
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
+#, fuzzy
 msgid "White Balance Temperature, Auto"
-msgstr ""
+msgstr "Zuri-balantzea,automatikoa"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
+#, fuzzy
 msgid "White Balance Temperature"
-msgstr ""
+msgstr "Zuri-balantzea,automatikoa"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
+#, fuzzy
 msgid "White Balance Component, Auto"
-msgstr ""
+msgstr "Zuri-balantzea,automatikoa"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
+#, fuzzy
 msgid "White Balance Blue Component"
-msgstr ""
+msgstr "Zuri-balantzea,automatikoa"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
+#, fuzzy
 msgid "White Balance Red Component"
-msgstr ""
+msgstr "Zuri-balantzea,automatikoa"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
+#, fuzzy
 msgid "Focus"
-msgstr ""
+msgstr "Fokatu"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
+#, fuzzy
 msgid "Focus (Absolute)"
-msgstr ""
+msgstr "Foku automatikoa"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr ""
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr ""
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr ""
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr ""
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr ""
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr ""
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr ""
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr ""
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr ""
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr ""
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr ""
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr ""
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr ""
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr ""
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr ""
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr ""
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr ""
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr ""
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr ""
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr ""
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr ""
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr ""
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr ""
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr ""
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr ""
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr ""
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr ""
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr ""
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr ""
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr ""
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr ""
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr ""
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr ""
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr ""
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr ""
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr ""
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr ""
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr ""
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr ""
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr ""
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr ""
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr ""
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Ezkerrera"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Eskuina"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Behera"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Gora"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "Modu automatikoa"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
+#, fuzzy
 msgid "Pan Reset"
-msgstr ""
+msgstr "Berrezarri"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
+#, fuzzy
 msgid "Tilt Reset"
-msgstr ""
+msgstr "Berrezarri"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
+#, fuzzy
 msgid "Pan/tilt Reset"
-msgstr ""
+msgstr "Berrezarri"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
+#, fuzzy
 msgid "Focus (absolute)"
-msgstr ""
+msgstr "Foku automatikoa"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr ""
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr ""
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr ""
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr ""
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr ""
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr ""
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr ""
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr ""
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr ""
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr ""
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr ""
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr ""
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr ""
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr ""
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr ""
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr ""
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr ""
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr ""
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Kapturatu beharreko argazki kopurua"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr ""
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr ""
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
+#, fuzzy
 msgid "Number of initial frames to skip"
-msgstr ""
+msgstr "Kapturatu beharreko argazki kopurua"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr ""
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Profila kargatu hastean"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "-aukera lokalak"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr ""
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "Fokatu"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr ""
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "Berria hasi"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "berrabiarazi"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "berria"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "utzi"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -974,20 +1009,29 @@
 "prozesu berria hasi edo berrabiarazi?\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Kargatu fitxategia"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr "Gucview oharra:"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "Ez dago leku nahikorik diskoan"
 
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
+
 #~ msgid "Invert (Pan)"
 #~ msgstr "Alderantzikatu (Biraketa)"
-
-#~ msgid "Reset"
-#~ msgstr "Berrezarri"

guvcview-src-1.5.3.tar.gz/po/fo.po -> guvcview-src-1.6.1.tar.gz/po/fo.po Changed

@@ -6,27 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2010-08-05 18:25+0000\n"
 "Last-Translator: Gunleif Joensen <Unknown>\n"
 "Language-Team: Faroese <fo@li.org>\n"
+"Language: fo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
 "X-Generator: Launchpad (build 14868)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr ""
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr ""
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -36,927 +37,964 @@
 "\n"
 "Kundi ikki lata tóleind upp"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
 msgstr ""
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr ""
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
+"Guvcview villa:\n"
+"\n"
+"Kundi ikki lata tóleind upp"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
 "Make sure you run guvcview as root (or sudo)."
 msgstr ""
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Can't set a valid video stream for guvcview"
 msgstr ""
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
 msgstr ""
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to start with minimum setup"
 msgstr ""
+"Guvcview villa:\n"
+"\n"
+"Kundi ikki lata tóleind upp"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr ""
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Couldn't query device capabilities"
 msgstr ""
+"Guvcview villa:\n"
+"\n"
+"Kundi ikki lata tóleind upp"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr ""
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Read method error"
 msgstr ""
+"Guvcview villa:\n"
+"\n"
+"Kundi ikki lata tóleind upp"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr ""
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to allocate Buffers"
 msgstr ""
+"Guvcview villa:\n"
+"\n"
+"Kundi ikki lata tóleind upp"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr ""
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr ""
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr ""
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr ""
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr ""
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr ""
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr ""
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr ""
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr ""
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to create Video Thread"
 msgstr ""
+"Guvcview villa:\n"
+"\n"
+"Kundi ikki lata tóleind upp"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr ""
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr ""
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr ""
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr ""
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr ""
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr ""
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr ""
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr ""
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr ""
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr ""
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr ""
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr ""
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr ""
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr ""
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr ""
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr ""
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr ""
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr ""
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr ""
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr ""
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr ""
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr ""
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr ""
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr ""
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr ""
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr ""
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr ""
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr ""
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr ""
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr ""
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr ""
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr ""
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr ""
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr ""
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr ""
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr ""
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr ""
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr ""
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr ""
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr ""
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr ""
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr ""
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr ""
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr ""
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr ""
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr ""
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr ""
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr ""
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr ""
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr ""
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr ""
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr ""
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr ""
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr ""
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr ""
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr ""
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr ""
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr ""
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr ""
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr ""
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr ""
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr ""
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr ""
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr ""
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr ""
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr ""
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr ""
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr ""
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr ""
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr ""
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr ""
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr ""
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr ""
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr ""
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 msgid "Auto"
 msgstr ""
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
 msgid "Pan Reset"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
 msgid "Tilt Reset"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr ""
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr ""
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr ""
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr ""
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr ""
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr ""
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr ""
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr ""
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr ""
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr ""
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr ""
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr ""
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr ""
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr ""
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr ""
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
-"Pixel "
-"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
-"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr ""
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr ""
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr ""
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr ""
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr ""
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr ""
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr ""
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr ""
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr ""
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr ""
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr ""
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr ""
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr ""
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr ""
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr ""
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr ""
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr ""
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
 msgstr ""
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr ""
+
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""

guvcview-src-1.5.3.tar.gz/po/fr.po -> guvcview-src-1.6.1.tar.gz/po/fr.po Changed

@@ -9,28 +9,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2012-01-24 18:12+0000\n"
 "Last-Translator: Pixep <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
 "X-Generator: Launchpad (build 14868)\n"
-"Language: pt\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Capture de vidéo Guvcview"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "Réglages GUVCViewer"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -40,7 +40,7 @@
 "\n"
 "Incapable d'accéder au périphérique"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -49,7 +49,7 @@
 "et que le pilote est installé."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -59,12 +59,12 @@
 "\n"
 "Contrôles de l'extension UVC"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "Les contrôles de l'extension ont été ajoutés au pilote UVC"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -74,7 +74,7 @@
 "\n"
 "Contrôles de l'extension UVC"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -85,7 +85,7 @@
 "Assurez-vous d'avoir lancé guvcview \n"
 "en tant qu'utilisateur root (ou sudo)."
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -95,7 +95,7 @@
 "\n"
 "Incapable de gérer le flux vidéo"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -103,7 +103,7 @@
 "Vérifiez que vous avez un pilote compatible v4l2\n"
 "et qu'il est correctement installé."
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -113,11 +113,11 @@
 "\n"
 "Incapable de démarrer avec des réglages minimum"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Veuillez rebrancher votre périphérique."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -127,11 +127,11 @@
 "\n"
 "Incapable d'accéder au périphérique"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Veuillez vérifier que le driver du matériel supporte V4L2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -141,11 +141,11 @@
 "\n"
 "erreur de lecteure"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "Veuillez essayer mmap (--capture_method=1) à la place."
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -155,48 +155,48 @@
 "\n"
 "Incapable d'assigner des tampons mémoires"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Veuillez essayer de redémarrer votre système."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Réglages de l'image"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Enregistrement :"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Profils de préférences :"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "Par défaut"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Arrêt Automatique"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Enr. Image"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Arrêter la vidéo"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Enr. Video"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -206,258 +206,258 @@
 "\n"
 "Incapable de créer le flux vidéo"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
-msgstr ""
-"Veuillez le reporter à http://developer.berlios.de/bugs/?group_id=8179"
+msgstr "Veuillez le reporter à http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "Raccourcis claviers"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Luminosité"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Teinte"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Saturation"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Netteté"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Correction de contre-jour"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "Fréquence de rafraîchissement"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "Teinte, Automatique"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Mise au Point Automatique"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Mode Manuel"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Mode Auto"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Mode Priorité Vitesse"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "Mode Priorité Ouverture"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Niveau de noir"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Balance des blancs, Automatique"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "Régler la balance des blancs"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Balance des rouges"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Balance des bleus"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Exposition"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "Gain, Automatique"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Gain"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Miroir horizontal"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Miroir vertical"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "Centré Horizontalement"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "Centrer verticalement"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr "Chroma CAG"
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr "Tueur de couleur"
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Effets de couleur"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "Commande de la caméra"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Exposition automatique"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "Temps d'exposition, Absolu"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr "Exposition, Nombre d'images par seconde dynamique"
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr "Panoramique, Relatif"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr "Inclinaison, Relatif"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr "Panoramique, Remise à zéro"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr "Inclinaison, Remise à zéro"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr "Panoramique, Absolu"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "Focale, Absolu"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "Focale, Relatif"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Focale, Automatique"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr "Zoom, Absolu"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr "Zoom, Relatif"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr "Zoom, Continu"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "Confidentialité"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Exposition, Auto"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Exposition, mode automatique"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Exposition (valeur absolue)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Balance des blancs, Auto"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Balance des blancs"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Balance des blancs par canal, Auto"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "Balance des Blancs, Canal Bleu"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "Balance des Blancs, Canal Rouge"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Mise au point"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr "Mise au point (Absolue)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Enregistrer le Fichier"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "Fichier num:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr "valeurs codec"
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
@@ -465,505 +465,504 @@
 "                              encodeur ips:   \n"
 " (0 - utilise la valeur ips de la combobox)"
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr " Pts monotones"
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "bit rate :   "
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr "qmax :   "
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr "qmin :   "
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr "qdiff max.:   "
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr "taille dia:   "
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr "taille pre dia:   "
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr "pre me:   "
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr "pre cmp:   "
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr "cmp:   "
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr "sous cmp:   "
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr "compte du dernier indicateur:   "
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr "taille gop:   "
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr "qcompress:   "
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr "qblur:   "
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr "subq:   "
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr "framerefs:   "
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr "méthode me:   "
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr "décision mb:   "
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr "nombre max d'images B:   "
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr "nb threads:   "
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Video et Fichiers"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Périphérique d'Entrée:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Fréquence d'image:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Afficher"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Résolution:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Sortie Caméra:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Assigner"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Qualité:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Ficher Image:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "Fichier, Auto"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Format d'Image:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr "Captuer une Image par Défaut"
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "Fichier Video:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Codec Video:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "propriétés"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Format Video:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr "Capturer une Vidéo par Défaut"
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Filtres Vidéo ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Miroir"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Inverser"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Négatif"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Monochrome"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr " Morceaux"
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr " Particules"
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr "valeurs du codec audio"
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Audio"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Son"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr " Afficher le VU-mètre"
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "Audio API:"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "PORTAUDIO"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Périphérique d'Entrée:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Valeur par Défaut"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "Taux d'échantillonage:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stéréo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Canaux:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Format Audio:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Effets Audio ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Echo"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr " Bruit"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Reverb"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " WahWah"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr " Canard"
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Gauche"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Droite"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Bas"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Haut"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr "Désactivé"
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr "Activé"
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr "Clignotement"
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 msgid "Auto"
 msgstr "Automatique"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr "8 bit"
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr "12 bit"
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr "Rotation Horizontale (valeur relative)"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr "Rotation Verticale (valeur relative)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
 msgid "Pan Reset"
 msgstr "Rotation Horizontale (remise à zero)"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
 msgid "Tilt Reset"
 msgstr "Rotation Verticale (remise à zero)"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "Rotation Horizontale/Verticale (remise à zero)"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr "Mise au Point (valeur absolue)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "Mode DEL1"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "Fréquence DEL1"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "Désactiver le post-traitement vidéo"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Données brutes par pixel"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - compressé"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - YUV non compressé"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RVB - BMP non compressé"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG video 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - flash video 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - wind. med. video 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - Mpeg video 2"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MP4 - MS Mpeg 4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr "MPEG4-ASP"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr "MPEG4-AVC (H264)"
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "Affiche la version"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Afficher information extra"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Périphérique video (défaut: /dev/video0)"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 "Quitter après avoir ajouter les contrôles d'extension (nécessite root/sudo)"
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr "Ne pas activer le flux vidéo (seulement contrôle d'image)"
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr "Ne pas afficher d'interface graphique"
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr "Méthode de capture  (1-mmap (par défaut)  2-read)"
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "Fichier de configuration"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "Accel. matérielle (activer(1) | desactiver(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
-"Pixel "
-"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
-"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
-"Format des "
-"pixels(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
-"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+"Format des pixels(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|"
+"nv61|y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Résolution, défaut: 640x480"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Ficher Image"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "Interval d'enr. des images (secondes)"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Nombre d'images à enregistrer"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "Fichier video (enr. de début)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "Durée de l'enr. video (secondes)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr "Quitte guvcview après avoir fermé la vidéo"
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr "Nombre d'images initiales à sauter"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "Afficher img/sec (activer(1) | desactiver(0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Charger réglages personnalisés"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- options locales"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Mise au Point (continu)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "Mise au Point"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr "Erreur"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
@@ -973,23 +972,23 @@
 "Vous avez plus d'un périphérique vidéo installé.\n"
 "Voulez-vous en essayer un autre ?\n"
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "commencez nouveau"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "Redémarrer l'application"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "nouveau"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "Annuler"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -997,14 +996,26 @@
 "nouveau processus ou redémarrage?\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Charger Fichier"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr "Avertissement Guvcview :"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "Il ne reste pas assez d'espace libre sur le disque"
+
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""

guvcview-src-1.5.3.tar.gz/po/gl.po -> guvcview-src-1.6.1.tar.gz/po/gl.po Changed

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2010-12-14 02:26+0000\n"
 "Last-Translator: Dario <dario.villar.v@gmail.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
@@ -19,16 +19,16 @@
 "X-Launchpad-Export-Date: 2011-01-19 14:28+0000\n"
 "X-Generator: Launchpad (build 12214)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Capturador de vídeo Guvcview"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "Controles de Guvcviewer"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -38,7 +38,7 @@
 "\n"
 "Non foi posíbel conectar a camara"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -47,57 +47,65 @@
 "e que o controlador está correctamente instalada."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr ""
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
+"Erro de Guvcview:\n"
+"\n"
+"Non foi posíbel asignarlle memoria aos búferes"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
 "Make sure you run guvcview as root (or sudo)."
 msgstr ""
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Can't set a valid video stream for guvcview"
 msgstr ""
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
 msgstr ""
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to start with minimum setup"
 msgstr ""
+"Erro de Guvcview:\n"
+"\n"
+"Non foi posíbel asignarlle memoria aos búferes"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Conecte de novo a súa camara."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -107,11 +115,11 @@
 "\n"
 "Non se poideron consultar as capacidades do dispositivo"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Asegúrese de que o controlador do dispositivo soporta v4l2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -121,11 +129,11 @@
 "\n"
 "Erro no método de lectura"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "Probe mmap no seu lugar  (--capture_method=1)."
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -135,48 +143,48 @@
 "\n"
 "Non foi posíbel asignarlle memoria aos búferes"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Probe reiniciando o seu sistema."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr ""
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Capturar:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr ""
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "Valores predeterminados"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr ""
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Cap. Imaxe"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Deter vídeo"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Cap. Video"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -186,797 +194,829 @@
 "\n"
 "Non foi posíble crear un fío de execución de vídeo"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 "Por favor, informe do erro a http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
+#, fuzzy
 msgid "User Controls"
-msgstr ""
+msgstr "Controles de Guvcviewer"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Brillo"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Ton"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Saturación"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Focalización"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr ""
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr ""
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "Matiz, Automático"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Foco, Automático"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Modo Manual"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Modo Automático"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Nivel de negro"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
+#, fuzzy
 msgid "White Balance, Automatic"
-msgstr ""
+msgstr "Ganancia, Automática"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
+#, fuzzy
 msgid "Do White Balance"
-msgstr ""
+msgstr "Balance vermello"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Balance vermello"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Balance azul"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Exposición"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "Ganancia, Automática"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Ganancia"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Xiro horizontal"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Xiro vertical"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
+#, fuzzy
 msgid "Horizontal Center"
-msgstr ""
+msgstr "Xiro horizontal"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
+#, fuzzy
 msgid "Vertical Center"
-msgstr ""
+msgstr "Xiro vertical"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Efectos de cor"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
+#, fuzzy
 msgid "Camera Controls"
-msgstr ""
+msgstr "Controles de Guvcviewer"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Exposición automática"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "Tempo de exposición, Absoluto"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
+#, fuzzy
 msgid "Pan, Relative"
-msgstr ""
+msgstr "Inclinación, relativo"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr "Inclinación, relativo"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
+#, fuzzy
 msgid "Pan, Reset"
-msgstr ""
+msgstr "Inclinación, Restabelecer"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr "Inclinación, Restabelecer"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
+#, fuzzy
 msgid "Pan, Absolute"
-msgstr ""
+msgstr "Foco, absoluto"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "Foco, absoluto"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "Foco, relativo"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Foco, automático"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
+#, fuzzy
 msgid "Zoom, Absolute"
-msgstr ""
+msgstr "Foco, absoluto"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
+#, fuzzy
 msgid "Zoom, Relative"
-msgstr ""
+msgstr "Foco, relativo"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
+#, fuzzy
 msgid "Zoom, Continuous"
-msgstr ""
+msgstr "Foco automático(continuo)"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Exposición, Automático"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Exposición, Prioridade automática"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Exposición (absoluto)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr ""
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr ""
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr ""
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Foco"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr "Foco(absoluto)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Gardar o ficheiro"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr ""
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr ""
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "Taxa de bits:   "
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr "qmax:   "
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr "qmin:   "
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr "max. qdiff:   "
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr "pre me:   "
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr "pre cmp:   "
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr "cmp:   "
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr "sub cmp:   "
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr "Tamaño do gop:   "
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr ""
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Dispositivo:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Taxa de fotogramas:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Mostrar"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Resolution:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Saída da cámara:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Calidade:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Ficheiro de imaxe:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr ""
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Formato da imaxe:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr ""
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Códec de vídeo:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "propiedades"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Formato de vídeo:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr ""
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Espello"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Inverter"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Negativo"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Mono"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr ""
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr " Partículas"
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Son"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Son"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr ""
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Dispositivo de entrada:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr ""
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "Taxa de mostraxe:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Canles:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Formato do son:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr ""
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Echo"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr " Difuso"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Reverberar"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr ""
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr ""
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Dereita"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Arriba"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "Modo Automático"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
+#, fuzzy
 msgid "Pan (relative)"
-msgstr ""
+msgstr "Inclinación, relativo"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
+#, fuzzy
 msgid "Tilt (relative)"
-msgstr ""
+msgstr "Inclinación, relativo"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
+#, fuzzy
 msgid "Pan Reset"
-msgstr ""
+msgstr "Inclinación, Restabelecer"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
+#, fuzzy
 msgid "Tilt Reset"
-msgstr ""
+msgstr "Inclinación, Restabelecer"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
+#, fuzzy
 msgid "Pan/tilt Reset"
-msgstr ""
+msgstr "Inclinación, Restabelecer"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
+#, fuzzy
 msgid "Focus (absolute)"
-msgstr ""
+msgstr "Foco(absoluto)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr ""
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr ""
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr ""
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr ""
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr ""
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr ""
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr ""
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr ""
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MS MP4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr "MPEG4-ASP"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr "MPEG4-AVC (H264)"
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "Mostrar a versión"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr ""
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr ""
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr ""
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr ""
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Tamaño predeterminado do marco:640x480"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Nome da imaxe"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr ""
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr ""
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr ""
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr ""
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr ""
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr ""
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr ""
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr ""
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Foco automático(continuo)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "Definir foco"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr "Erro"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr ""
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "reiniciar"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "novo"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "cancelar"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
 msgstr ""
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Cargar un ficheiro"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr ""
 
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
+
 #~ msgid "Make sure the device driver suports v4l2."
 #~ msgstr "Asegúrese de que o controlador do dispositivo soporta v4l2."

guvcview-src-1.5.3.tar.gz/po/guvcview.pot -> guvcview-src-1.6.1.tar.gz/po/guvcview.pot Changed

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-17 12:56+0000\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"
@@ -17,942 +17,984 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/guvcview.c:289
-msgid "Guvcview Video Capture"
+#: ../data/guvcview.desktop.in.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
 msgstr ""
 
-#: src/guvcview.c:301
-msgid "GUVCViewer Controls"
+#: ../data/guvcview.desktop.in.in.h:2
+msgid "GTK UVC video viewer"
 msgstr ""
 
-#. can't open device
-#: src/guvcview.c:346
-msgid ""
-"Guvcview error:\n"
-"\n"
-"Unable to open device"
+#: ../data/guvcview.desktop.in.in.h:3
+msgid "guvcview"
 msgstr ""
 
-#: src/guvcview.c:347
-msgid ""
-"Please make sure the camera is connected\n"
-"and that the correct driver is installed."
+#: ../src/acodecs.c:57
+msgid "PCM - uncompressed (16 bit)"
 msgstr ""
 
-#. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
-msgid ""
-"Guvcview:\n"
-"\n"
-"UVC Extension controls"
+#: ../src/acodecs.c:72
+msgid "MPEG2 - (lavc)"
 msgstr ""
 
-#: src/guvcview.c:353
-msgid "Extension controls were added to the UVC driver"
+#: ../src/acodecs.c:87
+msgid "MP3 - (lavc)"
 msgstr ""
 
-#. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
-msgid ""
-"Guvcview error:\n"
-"\n"
-"UVC Extension controls"
+#: ../src/acodecs.c:102
+msgid "Dolby AC3 - (lavc)"
 msgstr ""
 
-#: src/guvcview.c:361
-msgid ""
-"An error occurred while adding extension\n"
-"controls to the UVC driver\n"
-"Make sure you run guvcview as root (or sudo)."
+#: ../src/acodecs.c:117
+msgid "ACC Low - (faac)"
 msgstr ""
 
-#: src/guvcview.c:387 src/guvcview.c:465
-msgid ""
-"Guvcview error:\n"
-"\n"
-"Can't set a valid video stream for guvcview"
+#: ../src/audio_tab.c:46
+msgid "audio codec values"
 msgstr ""
 
-#: src/guvcview.c:388 src/guvcview.c:466
-msgid ""
-"Make sure your device driver is v4l2 compliant\n"
-"and that it is properly installed."
+#. bit rate
+#: ../src/audio_tab.c:59 ../src/video_tab.c:157
+msgid "bit rate:   "
 msgstr ""
 
-#: src/guvcview.c:410 src/guvcview.c:432
-msgid ""
-"Guvcview error:\n"
-"\n"
-"Unable to start with minimum setup"
+#: ../src/audio_tab.c:136
+msgid "Audio"
 msgstr ""
 
-#: src/guvcview.c:411 src/guvcview.c:433
-msgid "Please reconnect your camera."
+#: ../src/audio_tab.c:154
+msgid " Sound"
 msgstr ""
 
-#: src/guvcview.c:440
-msgid ""
-"Guvcview error:\n"
-"\n"
-"Couldn't query device capabilities"
+#. VU meter on the image (OSD)
+#: ../src/audio_tab.c:165
+msgid " Show VU meter"
 msgstr ""
 
-#: src/guvcview.c:441
-msgid "Make sure the device driver supports v4l2."
+#: ../src/audio_tab.c:177
+msgid "Audio API:"
 msgstr ""
 
-#: src/guvcview.c:445
-msgid ""
-"Guvcview error:\n"
-"\n"
-"Read method error"
+#: ../src/audio_tab.c:188
+msgid "PORTAUDIO"
 msgstr ""
 
-#: src/guvcview.c:446
-msgid "Please try mmap instead (--capture_method=1)."
+#: ../src/audio_tab.c:189
+msgid "PULSEAUDIO"
 msgstr ""
 
-#: src/guvcview.c:454
-msgid ""
-"Guvcview error:\n"
-"\n"
-"Unable to allocate Buffers"
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
+msgid "Input Device:"
 msgstr ""
 
-#: src/guvcview.c:455
-msgid "Please try restarting your system."
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
+msgid "Dev. Default"
 msgstr ""
 
-#: src/guvcview.c:494
-msgid "Image Controls"
+#: ../src/audio_tab.c:259
+msgid "Sample Rate:"
 msgstr ""
 
-#: src/guvcview.c:529
-msgid "Capture:"
+#: ../src/audio_tab.c:270
+msgid "1 - mono"
 msgstr ""
 
-#. increment column for labels
-#. end of control only exclusion
-#: src/guvcview.c:537
-msgid "Control Profiles:"
+#: ../src/audio_tab.c:271
+msgid "2 - stereo"
 msgstr ""
 
-#: src/guvcview.c:552
-msgid "Defaults"
+#: ../src/audio_tab.c:306
+msgid "Channels:"
 msgstr ""
 
-#. image auto capture
-#: src/guvcview.c:565
-msgid "Stop Auto"
+#: ../src/audio_tab.c:340
+msgid "Audio Format:"
 msgstr ""
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
-msgid "Cap. Image"
+#. lavc codec properties button
+#: ../src/audio_tab.c:347 ../src/video_tab.c:891
+msgid "properties"
 msgstr ""
 
-#. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
-msgid "Stop Video"
+#: ../src/audio_tab.c:356
+msgid "---- Audio Effects ----"
 msgstr ""
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
-msgid "Cap. Video"
+#. Echo
+#: ../src/audio_tab.c:375
+msgid " Echo"
+msgstr ""
+
+#. FUZZ
+#: ../src/audio_tab.c:386
+msgid " Fuzz"
+msgstr ""
+
+#. Reverb
+#: ../src/audio_tab.c:398
+msgid " Reverb"
+msgstr ""
+
+#. WahWah
+#: ../src/audio_tab.c:410
+msgid " WahWah"
+msgstr ""
+
+#. Ducky
+#: ../src/audio_tab.c:422
+msgid " Ducky"
+msgstr ""
+
+#: ../src/callbacks.c:106
+msgid "Error"
 msgstr ""
 
-#: src/guvcview.c:735
+#: ../src/callbacks.c:130
 msgid ""
-"Guvcview error:\n"
 "\n"
-"Unable to create Video Thread"
+"You have more than one video device installed.\n"
+"Do you want to try another one ?\n"
 msgstr ""
 
-#: src/guvcview.c:736
-msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
+#. Devices
+#: ../src/callbacks.c:137 ../src/video_tab.c:532
+msgid "Device:"
 msgstr ""
 
-#. needed only for language files (not used)
-#. V4L2 control strings
-#: src/v4l2uvc.c:54
-msgid "User Controls"
+#. if auto naming restart counter
+#: ../src/callbacks.c:607 ../src/callbacks.c:889 ../src/callbacks.c:1038
+#: ../src/callbacks.c:1055 ../src/callbacks.c:1091 ../src/callbacks.c:1206
+#: ../src/globals.c:78 ../src/globals.c:81 ../src/options.c:333
+#: ../src/options.c:452 ../src/options.c:509 ../src/timers.c:97
+#: ../src/video_tab.c:76 ../src/video_tab.c:106
+#, c-format
+msgid "File num:%d"
 msgstr ""
 
-#: src/v4l2uvc.c:55
-msgid "Brightness"
+#: ../src/callbacks.c:658
+msgid "start new"
 msgstr ""
 
-#: src/v4l2uvc.c:56
-msgid "Contrast"
+#: ../src/callbacks.c:661
+msgid "restart"
 msgstr ""
 
-#: src/v4l2uvc.c:57
-msgid "Hue"
+#: ../src/callbacks.c:663
+msgid "new"
 msgstr ""
 
-#: src/v4l2uvc.c:58
-msgid "Saturation"
+#: ../src/callbacks.c:665
+msgid "cancel"
 msgstr ""
 
-#: src/v4l2uvc.c:59
-msgid "Sharpness"
+#: ../src/callbacks.c:670
+msgid ""
+"launch new process or restart?.\n"
+"\n"
 msgstr ""
 
-#: src/v4l2uvc.c:60
-msgid "Gamma"
+#: ../src/callbacks.c:1117 ../src/guvcview.c:564 ../src/timers.c:113
+msgid "Cap. Image"
 msgstr ""
 
-#: src/v4l2uvc.c:61
-msgid "Backlight Compensation"
+#: ../src/callbacks.c:1193 ../src/create_video.c:870 ../src/guvcview.c:574
+#: ../src/guvcview.c:770
+msgid "Cap. Video"
 msgstr ""
 
-#: src/v4l2uvc.c:62
-msgid "Power Line Frequency"
+#. vid capture enabled from start
+#: ../src/callbacks.c:1251 ../src/guvcview.c:569
+msgid "Stop Video"
 msgstr ""
 
-#: src/v4l2uvc.c:63
-msgid "Hue, Automatic"
+#: ../src/callbacks.c:1321 ../src/video_tab.c:41
+msgid "Save File"
 msgstr ""
 
-#: src/v4l2uvc.c:64
-msgid "Focus, Auto"
+#: ../src/callbacks.c:1334
+msgid "Load File"
 msgstr ""
 
-#: src/v4l2uvc.c:65
-msgid "Manual Mode"
+#: ../src/guvcview.c:285
+msgid "Guvcview Video Capture"
 msgstr ""
 
-#: src/v4l2uvc.c:66
-msgid "Auto Mode"
+#: ../src/guvcview.c:297
+msgid "GUVCViewer Controls"
 msgstr ""
 
-#: src/v4l2uvc.c:67
-msgid "Shutter Priority Mode"
+#. can't open device
+#: ../src/guvcview.c:342
+msgid ""
+"Guvcview error:\n"
+"\n"
+"Unable to open device"
 msgstr ""
 
-#: src/v4l2uvc.c:68
-msgid "Aperture Priority Mode"
+#: ../src/guvcview.c:343
+msgid ""
+"Please make sure the camera is connected\n"
+"and that the correct driver is installed."
 msgstr ""
 
-#: src/v4l2uvc.c:69
-msgid "Black Level"
+#. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
+#: ../src/guvcview.c:348
+msgid ""
+"Guvcview:\n"
+"\n"
+"UVC Extension controls"
 msgstr ""
 
-#: src/v4l2uvc.c:70
-msgid "White Balance, Automatic"
+#: ../src/guvcview.c:349
+msgid "Extension controls were added to the UVC driver"
 msgstr ""
 
-#: src/v4l2uvc.c:71
-msgid "Do White Balance"
+#. uvc extension controls error - EACCES (needs root user)
+#: ../src/guvcview.c:356
+msgid ""
+"Guvcview error:\n"
+"\n"
+"UVC Extension controls"
 msgstr ""
 
-#: src/v4l2uvc.c:72
-msgid "Red Balance"
+#: ../src/guvcview.c:357
+msgid ""
+"An error occurred while adding extension\n"
+"controls to the UVC driver\n"
+"Make sure you run guvcview as root (or sudo)."
 msgstr ""
 
-#: src/v4l2uvc.c:73
-msgid "Blue Balance"
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
+msgid ""
+"Guvcview error:\n"
+"\n"
+"Can't set a valid video stream for guvcview"
 msgstr ""
 
-#: src/v4l2uvc.c:74
-msgid "Exposure"
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
+msgid ""
+"Make sure your device driver is v4l2 compliant\n"
+"and that it is properly installed."
 msgstr ""
 
-#: src/v4l2uvc.c:75
-msgid "Gain, Automatic"
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
+msgid ""
+"Guvcview error:\n"
+"\n"
+"Unable to start with minimum setup"
 msgstr ""
 
-#: src/v4l2uvc.c:76
-msgid "Gain"
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
+msgid "Please reconnect your camera."
 msgstr ""
 
-#: src/v4l2uvc.c:77
-msgid "Horizontal Flip"
+#: ../src/guvcview.c:436
+msgid ""
+"Guvcview error:\n"
+"\n"
+"Couldn't query device capabilities"
 msgstr ""
 
-#: src/v4l2uvc.c:78
-msgid "Vertical Flip"
+#: ../src/guvcview.c:437
+msgid "Make sure the device driver supports v4l2."
 msgstr ""
 
-#: src/v4l2uvc.c:79
-msgid "Horizontal Center"
+#: ../src/guvcview.c:441
+msgid ""
+"Guvcview error:\n"
+"\n"
+"Read method error"
 msgstr ""
 
-#: src/v4l2uvc.c:80
-msgid "Vertical Center"
+#: ../src/guvcview.c:442
+msgid "Please try mmap instead (--capture_method=1)."
 msgstr ""
 
-#: src/v4l2uvc.c:81
-msgid "Chroma AGC"
+#: ../src/guvcview.c:450
+msgid ""
+"Guvcview error:\n"
+"\n"
+"Unable to allocate Buffers"
 msgstr ""
 
-#: src/v4l2uvc.c:82
-msgid "Color Killer"
+#: ../src/guvcview.c:451
+msgid "Please try restarting your system."
 msgstr ""
 
-#: src/v4l2uvc.c:83
-msgid "Color Effects"
+#: ../src/guvcview.c:490
+msgid "Image Controls"
 msgstr ""
 
-#. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
-msgid "Camera Controls"
+#: ../src/guvcview.c:527
+msgid "Capture:"
 msgstr ""
 
-#: src/v4l2uvc.c:87
-msgid "Auto Exposure"
+#. increment column for labels
+#. end of control only exclusion
+#: ../src/guvcview.c:534
+msgid "Control Profiles:"
 msgstr ""
 
-#: src/v4l2uvc.c:88
-msgid "Exposure Time, Absolute"
+#: ../src/guvcview.c:547
+msgid "Defaults"
 msgstr ""
 
-#: src/v4l2uvc.c:89
-msgid "Exposure, Dynamic Framerate"
+#. image auto capture
+#: ../src/guvcview.c:560
+msgid "Stop Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:90
-msgid "Pan, Relative"
+#: ../src/guvcview.c:720
+msgid ""
+"Guvcview error:\n"
+"\n"
+"Unable to create Video Thread"
 msgstr ""
 
-#: src/v4l2uvc.c:91
-msgid "Tilt, Relative"
+#: ../src/guvcview.c:721
+msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 
-#: src/v4l2uvc.c:92
-msgid "Pan, Reset"
+#: ../src/img_controls.c:121
+msgid "Auto Focus (continuous)"
 msgstr ""
 
-#: src/v4l2uvc.c:93
-msgid "Tilt, Reset"
+#: ../src/img_controls.c:122
+msgid "set Focus"
 msgstr ""
 
-#: src/v4l2uvc.c:94
-msgid "Pan, Absolute"
+#: ../src/options.c:761
+msgid "Prints version"
 msgstr ""
 
-#: src/v4l2uvc.c:96
-msgid "Focus, Absolute"
+#: ../src/options.c:762
+msgid "Displays debug information"
 msgstr ""
 
-#: src/v4l2uvc.c:97
-msgid "Focus, Relative"
+#: ../src/options.c:763
+msgid "Video Device to use default: /dev/video0"
 msgstr ""
 
-#: src/v4l2uvc.c:98
-msgid "Focus, Automatic"
+#: ../src/options.c:764
+msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/v4l2uvc.c:99
-msgid "Zoom, Absolute"
+#: ../src/options.c:765
+msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/v4l2uvc.c:100
-msgid "Zoom, Relative"
+#: ../src/options.c:766
+msgid "Don't display a GUI"
 msgstr ""
 
-#: src/v4l2uvc.c:101
-msgid "Zoom, Continuous"
+#: ../src/options.c:767
+msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/v4l2uvc.c:102
-msgid "Privacy"
+#: ../src/options.c:768
+msgid "Configuration file"
 msgstr ""
 
-#. UVC specific control strings
-#: src/v4l2uvc.c:105
-msgid "Exposure, Auto"
+#: ../src/options.c:769
+msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr ""
 
-#: src/v4l2uvc.c:106
-msgid "Exposure, Auto Priority"
+#: ../src/options.c:770
+msgid ""
+"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
 
-#: src/v4l2uvc.c:107
-msgid "Exposure (Absolute)"
+#: ../src/options.c:771
+msgid "Frame size, default: 640x480"
 msgstr ""
 
-#: src/v4l2uvc.c:108
-msgid "White Balance Temperature, Auto"
+#: ../src/options.c:772
+msgid "Image File name"
 msgstr ""
 
-#: src/v4l2uvc.c:109
-msgid "White Balance Temperature"
+#: ../src/options.c:773
+msgid "Image capture interval in seconds"
 msgstr ""
 
-#: src/v4l2uvc.c:110
-msgid "White Balance Component, Auto"
+#: ../src/options.c:774
+msgid "Number of Pictures to capture"
 msgstr ""
 
-#: src/v4l2uvc.c:111
-msgid "White Balance Blue Component"
+#: ../src/options.c:775
+msgid "Video File name (capture from start)"
 msgstr ""
 
-#: src/v4l2uvc.c:112
-msgid "White Balance Red Component"
+#: ../src/options.c:776
+msgid "Video capture time (in seconds)"
 msgstr ""
 
-#. libwebcam specific control strings
-#: src/v4l2uvc.c:115
-msgid "Focus"
+#: ../src/options.c:777
+msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/v4l2uvc.c:116
-msgid "Focus (Absolute)"
+#: ../src/options.c:778
+msgid "Number of initial frames to skip"
 msgstr ""
 
-#: src/video_tab.c:41 src/callbacks.c:1331
-msgid "Save File"
+#: ../src/options.c:779
+msgid "Show FPS value (enable(1) | disable (0))"
 msgstr ""
 
-#. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
-#, c-format
-msgid "File num:%d"
+#: ../src/options.c:780
+msgid "Load Profile at start"
 msgstr ""
 
-#: src/video_tab.c:126
-msgid "codec values"
+#: ../src/options.c:786
+msgid "- local options"
 msgstr ""
 
-#: src/video_tab.c:137
-msgid ""
-"                              encoder fps:   \n"
-" (0 - use fps combobox value)"
+#: ../src/timers.c:211
+msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/video_tab.c:152
-msgid " monotonic pts"
+#: ../src/timers.c:211
+msgid "Not enough free space left on disk"
 msgstr ""
 
-#. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
-msgid "bit rate:   "
+#: ../src/v4l2_controls.c:712
+msgid "Left"
 msgstr ""
 
-#: src/video_tab.c:175
-msgid "qmax:   "
+#: ../src/v4l2_controls.c:713
+msgid "Right"
 msgstr ""
 
-#: src/video_tab.c:190
-msgid "qmin:   "
+#: ../src/v4l2_controls.c:717
+msgid "Down"
 msgstr ""
 
-#: src/video_tab.c:205
-msgid "max. qdiff:   "
+#: ../src/v4l2_controls.c:718
+msgid "Up"
 msgstr ""
 
-#: src/video_tab.c:220
-msgid "dia size:   "
+#: ../src/v4l2_controls.c:763
+msgid "Off"
 msgstr ""
 
-#: src/video_tab.c:235
-msgid "pre dia size:   "
+#: ../src/v4l2_controls.c:763
+msgid "On"
 msgstr ""
 
-#: src/video_tab.c:250
-msgid "pre me:   "
+#: ../src/v4l2_controls.c:763
+msgid "Blinking"
 msgstr ""
 
-#: src/video_tab.c:265
-msgid "pre cmp:   "
+#: ../src/v4l2_controls.c:763
+msgid "Auto"
 msgstr ""
 
-#: src/video_tab.c:280
-msgid "cmp:   "
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
+msgid "8 bit"
 msgstr ""
 
-#: src/video_tab.c:295
-msgid "sub cmp:   "
+#: ../src/v4l2_controls.c:814
+msgid "12 bit"
 msgstr ""
 
-#: src/video_tab.c:310
-msgid "last predictor count:   "
+#: ../src/v4l2_dyna_ctrls.c:89
+msgid "Pan (relative)"
 msgstr ""
 
-#: src/video_tab.c:325
-msgid "gop size:   "
+#: ../src/v4l2_dyna_ctrls.c:99
+msgid "Tilt (relative)"
 msgstr ""
 
-#: src/video_tab.c:340
-msgid "qcompress:   "
+#: ../src/v4l2_dyna_ctrls.c:109
+msgid "Pan Reset"
 msgstr ""
 
-#: src/video_tab.c:355
-msgid "qblur:   "
+#: ../src/v4l2_dyna_ctrls.c:119
+msgid "Tilt Reset"
 msgstr ""
 
-#: src/video_tab.c:370
-msgid "subq:   "
+#: ../src/v4l2_dyna_ctrls.c:129
+msgid "Pan/tilt Reset"
+msgstr ""
+
+#: ../src/v4l2_dyna_ctrls.c:139
+msgid "Focus (absolute)"
+msgstr ""
+
+#: ../src/v4l2_dyna_ctrls.c:149
+msgid "LED1 Mode"
+msgstr ""
+
+#: ../src/v4l2_dyna_ctrls.c:159
+msgid "LED1 Frequency"
+msgstr ""
+
+#: ../src/v4l2_dyna_ctrls.c:169
+msgid "Disable video processing"
+msgstr ""
+
+#: ../src/v4l2_dyna_ctrls.c:179
+msgid "Raw bits per pixel"
 msgstr ""
 
-#: src/video_tab.c:385
-msgid "framerefs:   "
+#. needed only for language files (not used)
+#. V4L2 control strings
+#: ../src/v4l2uvc.c:56
+msgid "User Controls"
 msgstr ""
 
-#: src/video_tab.c:400
-msgid "me method:   "
+#: ../src/v4l2uvc.c:57
+msgid "Brightness"
 msgstr ""
 
-#: src/video_tab.c:415
-msgid "mb decision:   "
+#: ../src/v4l2uvc.c:58
+msgid "Contrast"
 msgstr ""
 
-#: src/video_tab.c:430
-msgid "max B frames:   "
+#: ../src/v4l2uvc.c:59
+msgid "Hue"
 msgstr ""
 
-#: src/video_tab.c:445
-msgid "num threads:   "
+#: ../src/v4l2uvc.c:60
+msgid "Saturation"
 msgstr ""
 
-#: src/video_tab.c:555
-msgid "Video & Files"
+#: ../src/v4l2uvc.c:61
+msgid "Sharpness"
 msgstr ""
 
-#. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
-msgid "Device:"
+#: ../src/v4l2uvc.c:62
+msgid "Gamma"
 msgstr ""
 
-#: src/video_tab.c:673
-msgid "Frame Rate:"
+#: ../src/v4l2uvc.c:63
+msgid "Backlight Compensation"
 msgstr ""
 
-#: src/video_tab.c:681
-msgid " Show"
+#: ../src/v4l2uvc.c:64
+msgid "Power Line Frequency"
 msgstr ""
 
-#: src/video_tab.c:705
-msgid "Resolution:"
+#: ../src/v4l2uvc.c:65
+msgid "Hue, Automatic"
 msgstr ""
 
-#: src/video_tab.c:731
-msgid "Camera Output:"
+#: ../src/v4l2uvc.c:66
+msgid "Focus, Auto"
 msgstr ""
 
-#: src/video_tab.c:753
-msgid "Apply"
+#: ../src/v4l2uvc.c:67
+msgid "Manual Mode"
 msgstr ""
 
-#: src/video_tab.c:761
-msgid "Quality:"
+#: ../src/v4l2uvc.c:68
+msgid "Auto Mode"
 msgstr ""
 
-#: src/video_tab.c:771
-msgid "Image File:"
+#: ../src/v4l2uvc.c:69
+msgid "Shutter Priority Mode"
 msgstr ""
 
-#: src/video_tab.c:804 src/video_tab.c:898
-msgid "File,Auto"
+#: ../src/v4l2uvc.c:70
+msgid "Aperture Priority Mode"
 msgstr ""
 
-#: src/video_tab.c:815
-msgid "Image Format:"
+#: ../src/v4l2uvc.c:71
+msgid "Black Level"
 msgstr ""
 
-#: src/video_tab.c:841
-msgid "Take Picture by Default"
+#: ../src/v4l2uvc.c:72
+msgid "White Balance, Automatic"
 msgstr ""
 
-#: src/video_tab.c:853
-msgid "Video File:"
+#: ../src/v4l2uvc.c:73
+msgid "Do White Balance"
 msgstr ""
 
-#: src/video_tab.c:931
-msgid "Video Codec:"
+#: ../src/v4l2uvc.c:74
+msgid "Red Balance"
 msgstr ""
 
-#. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
-msgid "properties"
+#: ../src/v4l2uvc.c:75
+msgid "Blue Balance"
 msgstr ""
 
-#: src/video_tab.c:966
-msgid "Video Format:"
+#: ../src/v4l2uvc.c:76
+msgid "Exposure"
 msgstr ""
 
-#: src/video_tab.c:973
-msgid "Take Video by Default"
+#: ../src/v4l2uvc.c:77
+msgid "Gain, Automatic"
 msgstr ""
 
-#: src/video_tab.c:984
-msgid "---- Video Filters ----"
+#: ../src/v4l2uvc.c:78
+msgid "Gain"
 msgstr ""
 
-#. Mirror
-#: src/video_tab.c:999
-msgid " Mirror"
+#: ../src/v4l2uvc.c:79
+msgid "Horizontal Flip"
 msgstr ""
 
-#. Upturn
-#: src/video_tab.c:1009
-msgid " Invert"
+#: ../src/v4l2uvc.c:80
+msgid "Vertical Flip"
 msgstr ""
 
-#. Negate
-#: src/video_tab.c:1019
-msgid " Negative"
+#: ../src/v4l2uvc.c:81
+msgid "Horizontal Center"
 msgstr ""
 
-#. Mono
-#: src/video_tab.c:1029
-msgid " Mono"
+#: ../src/v4l2uvc.c:82
+msgid "Vertical Center"
 msgstr ""
 
-#. Pieces
-#: src/video_tab.c:1040
-msgid " Pieces"
+#: ../src/v4l2uvc.c:83
+msgid "Chroma AGC"
 msgstr ""
 
-#. Particles
-#: src/video_tab.c:1051
-msgid " Particles"
+#: ../src/v4l2uvc.c:84
+msgid "Color Killer"
 msgstr ""
 
-#: src/audio_tab.c:46
-msgid "audio codec values"
+#: ../src/v4l2uvc.c:85
+msgid "Color Effects"
 msgstr ""
 
-#: src/audio_tab.c:132
-msgid "Audio"
+#. CAMERA CLASS control strings
+#: ../src/v4l2uvc.c:88
+msgid "Camera Controls"
 msgstr ""
 
-#: src/audio_tab.c:150
-msgid " Sound"
+#: ../src/v4l2uvc.c:89
+msgid "Auto Exposure"
 msgstr ""
 
-#. VU meter on the image (OSD)
-#: src/audio_tab.c:162
-msgid " Show VU meter"
+#: ../src/v4l2uvc.c:90
+msgid "Exposure Time, Absolute"
 msgstr ""
 
-#: src/audio_tab.c:175
-msgid "Audio API:"
+#: ../src/v4l2uvc.c:91
+msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/audio_tab.c:185
-msgid "PORTAUDIO"
+#: ../src/v4l2uvc.c:92
+msgid "Pan, Relative"
 msgstr ""
 
-#: src/audio_tab.c:186
-msgid "PULSEAUDIO"
+#: ../src/v4l2uvc.c:93
+msgid "Tilt, Relative"
 msgstr ""
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
-msgid "Input Device:"
+#: ../src/v4l2uvc.c:94
+msgid "Pan, Reset"
 msgstr ""
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
-msgid "Dev. Default"
+#: ../src/v4l2uvc.c:95
+msgid "Tilt, Reset"
 msgstr ""
 
-#: src/audio_tab.c:257
-msgid "Sample Rate:"
+#: ../src/v4l2uvc.c:96
+msgid "Pan, Absolute"
 msgstr ""
 
-#: src/audio_tab.c:269
-msgid "1 - mono"
+#: ../src/v4l2uvc.c:98
+msgid "Focus, Absolute"
 msgstr ""
 
-#: src/audio_tab.c:270
-msgid "2 - stereo"
+#: ../src/v4l2uvc.c:99
+msgid "Focus, Relative"
 msgstr ""
 
-#: src/audio_tab.c:304
-msgid "Channels:"
+#: ../src/v4l2uvc.c:100
+msgid "Focus, Automatic"
 msgstr ""
 
-#: src/audio_tab.c:338
-msgid "Audio Format:"
+#: ../src/v4l2uvc.c:101
+msgid "Zoom, Absolute"
 msgstr ""
 
-#: src/audio_tab.c:356
-msgid "---- Audio Effects ----"
+#: ../src/v4l2uvc.c:102
+msgid "Zoom, Relative"
 msgstr ""
 
-#. Echo
-#: src/audio_tab.c:375
-msgid " Echo"
+#: ../src/v4l2uvc.c:103
+msgid "Zoom, Continuous"
 msgstr ""
 
-#. FUZZ
-#: src/audio_tab.c:385
-msgid " Fuzz"
+#: ../src/v4l2uvc.c:104
+msgid "Privacy"
 msgstr ""
 
-#. Reverb
-#: src/audio_tab.c:396
-msgid " Reverb"
+#. UVC specific control strings
+#: ../src/v4l2uvc.c:107
+msgid "Exposure, Auto"
 msgstr ""
 
-#. WahWah
-#: src/audio_tab.c:407
-msgid " WahWah"
+#: ../src/v4l2uvc.c:108
+msgid "Exposure, Auto Priority"
 msgstr ""
 
-#. Ducky
-#: src/audio_tab.c:418
-msgid " Ducky"
+#: ../src/v4l2uvc.c:109
+msgid "Exposure (Absolute)"
 msgstr ""
 
-#: src/v4l2_controls.c:732
-msgid "Left"
+#: ../src/v4l2uvc.c:110
+msgid "White Balance Temperature, Auto"
 msgstr ""
 
-#: src/v4l2_controls.c:733
-msgid "Right"
+#: ../src/v4l2uvc.c:111
+msgid "White Balance Temperature"
 msgstr ""
 
-#: src/v4l2_controls.c:737
-msgid "Down"
+#: ../src/v4l2uvc.c:112
+msgid "White Balance Component, Auto"
 msgstr ""
 
-#: src/v4l2_controls.c:738
-msgid "Up"
+#: ../src/v4l2uvc.c:113
+msgid "White Balance Blue Component"
 msgstr ""
 
-#: src/v4l2_controls.c:787
-msgid "Off"
+#: ../src/v4l2uvc.c:114
+msgid "White Balance Red Component"
 msgstr ""
 
-#: src/v4l2_controls.c:790
-msgid "On"
+#. libwebcam specific control strings
+#: ../src/v4l2uvc.c:117
+msgid "Focus"
 msgstr ""
 
-#: src/v4l2_controls.c:793
-msgid "Blinking"
+#: ../src/v4l2uvc.c:118
+msgid "Focus (Absolute)"
 msgstr ""
 
-#: src/v4l2_controls.c:796
-msgid "Auto"
+#: ../src/vcodecs.c:62
+msgid "MJPG - compressed"
 msgstr ""
 
-#: src/v4l2_controls.c:814
-msgid "8 bit"
+#: ../src/vcodecs.c:97
+msgid "YUY2 - uncomp YUV"
 msgstr ""
 
-#: src/v4l2_controls.c:817
-msgid "12 bit"
+#: ../src/vcodecs.c:132
+msgid "RGB - uncomp BMP"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
-msgid "Pan (relative)"
+#: ../src/vcodecs.c:167
+msgid "MPEG video 1"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:99
-msgid "Tilt (relative)"
+#: ../src/vcodecs.c:202
+msgid "FLV1 - flash video 1"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:109
-msgid "Pan Reset"
+#: ../src/vcodecs.c:237
+msgid "WMV1 - win. med. video 7"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:119
-msgid "Tilt Reset"
+#: ../src/vcodecs.c:272
+msgid "MPG2 - MPG2 format"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:129
-msgid "Pan/tilt Reset"
+#: ../src/vcodecs.c:307
+msgid "MS MP4 V3"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:139
-msgid "Focus (absolute)"
+#: ../src/vcodecs.c:342
+msgid "MPEG4-ASP"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:149
-msgid "LED1 Mode"
+#: ../src/vcodecs.c:377
+msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:159
-msgid "LED1 Frequency"
+#: ../src/video_format.c:43
+msgid "AVI - avi format"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:169
-msgid "Disable video processing"
+#: ../src/video_format.c:51
+msgid "MKV - Matroska format"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:179
-msgid "Raw bits per pixel"
+#: ../src/video_tab.c:126
+msgid "codec values"
 msgstr ""
 
-#: src/vcodecs.c:62
-msgid "MJPG - compressed"
+#: ../src/video_tab.c:137
+msgid ""
+"                              encoder fps:   \n"
+" (0 - use fps combobox value)"
 msgstr ""
 
-#: src/vcodecs.c:97
-msgid "YUY2 - uncomp YUV"
+#: ../src/video_tab.c:150
+msgid " monotonic pts"
 msgstr ""
 
-#: src/vcodecs.c:132
-msgid "RGB - uncomp BMP"
+#: ../src/video_tab.c:170
+msgid "qmax:   "
 msgstr ""
 
-#: src/vcodecs.c:167
-msgid "MPEG video 1"
+#: ../src/video_tab.c:183
+msgid "qmin:   "
 msgstr ""
 
-#: src/vcodecs.c:202
-msgid "FLV1 - flash video 1"
+#: ../src/video_tab.c:196
+msgid "max. qdiff:   "
 msgstr ""
 
-#: src/vcodecs.c:237
-msgid "WMV1 - win. med. video 7"
+#: ../src/video_tab.c:209
+msgid "dia size:   "
 msgstr ""
 
-#: src/vcodecs.c:272
-msgid "MPG2 - MPG2 format"
+#: ../src/video_tab.c:222
+msgid "pre dia size:   "
 msgstr ""
 
-#: src/vcodecs.c:307
-msgid "MS MP4 V3"
+#: ../src/video_tab.c:235
+msgid "pre me:   "
 msgstr ""
 
-#: src/vcodecs.c:342
-msgid "MPEG4-ASP"
+#: ../src/video_tab.c:248
+msgid "pre cmp:   "
 msgstr ""
 
-#: src/vcodecs.c:377
-msgid "MPEG4-AVC (H264)"
+#: ../src/video_tab.c:261
+msgid "cmp:   "
 msgstr ""
 
-#: src/options.c:753
-msgid "Prints version"
+#: ../src/video_tab.c:274
+msgid "sub cmp:   "
 msgstr ""
 
-#: src/options.c:754
-msgid "Displays debug information"
+#: ../src/video_tab.c:287
+msgid "last predictor count:   "
 msgstr ""
 
-#: src/options.c:755
-msgid "Video Device to use default: /dev/video0"
+#: ../src/video_tab.c:300
+msgid "gop size:   "
 msgstr ""
 
-#: src/options.c:756
-msgid "Exit after adding UVC extension controls (needs root/sudo)"
+#: ../src/video_tab.c:313
+msgid "qcompress:   "
 msgstr ""
 
-#: src/options.c:757
-msgid "Don't stream video (image controls only)"
+#: ../src/video_tab.c:326
+msgid "qblur:   "
 msgstr ""
 
-#: src/options.c:758
-msgid "Don't display a GUI"
+#: ../src/video_tab.c:339
+msgid "subq:   "
 msgstr ""
 
-#: src/options.c:759
-msgid "Capture method (1-mmap (default)  2-read)"
+#: ../src/video_tab.c:352
+msgid "framerefs:   "
 msgstr ""
 
-#: src/options.c:760
-msgid "Configuration file"
+#: ../src/video_tab.c:365
+msgid "me method:   "
 msgstr ""
 
-#: src/options.c:761
-msgid "Hardware accelaration (enable(1) | disable(0))"
+#: ../src/video_tab.c:378
+msgid "mb decision:   "
 msgstr ""
 
-#: src/options.c:762
-msgid ""
-"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
-"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+#: ../src/video_tab.c:391
+msgid "max B frames:   "
 msgstr ""
 
-#: src/options.c:763
-msgid "Frame size, default: 640x480"
+#: ../src/video_tab.c:404
+msgid "num threads:   "
 msgstr ""
 
-#: src/options.c:764
-msgid "Image File name"
+#: ../src/video_tab.c:516
+msgid "Video & Files"
 msgstr ""
 
-#: src/options.c:765
-msgid "Image capture interval in seconds"
+#: ../src/video_tab.c:637
+msgid "Frame Rate:"
 msgstr ""
 
-#: src/options.c:766
-msgid "Number of Pictures to capture"
+#: ../src/video_tab.c:644
+msgid " Show"
 msgstr ""
 
-#: src/options.c:767
-msgid "Video File name (capture from start)"
+#: ../src/video_tab.c:666
+msgid "Resolution:"
 msgstr ""
 
-#: src/options.c:768
-msgid "Video capture time (in seconds)"
+#: ../src/video_tab.c:692
+msgid "Camera Output:"
 msgstr ""
 
-#: src/options.c:769
-msgid "Exits guvcview after closing video"
+#: ../src/video_tab.c:714
+msgid "Apply"
 msgstr ""
 
-#: src/options.c:770
-msgid "Number of initial frames to skip"
+#: ../src/video_tab.c:721
+msgid "Quality:"
 msgstr ""
 
-#: src/options.c:771
-msgid "Show FPS value (enable(1) | disable (0))"
+#: ../src/video_tab.c:730
+msgid "Image File:"
 msgstr ""
 
-#: src/options.c:772
-msgid "Load Profile at start"
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
+msgid "File,Auto"
 msgstr ""
 
-#: src/options.c:778
-msgid "- local options"
+#: ../src/video_tab.c:771
+msgid "Image Format:"
 msgstr ""
 
-#: src/img_controls.c:117
-msgid "Auto Focus (continuous)"
+#: ../src/video_tab.c:797
+msgid "Take Picture by Default"
 msgstr ""
 
-#: src/img_controls.c:118
-msgid "set Focus"
+#: ../src/video_tab.c:808
+msgid "Video File:"
 msgstr ""
 
-#: src/callbacks.c:102
-msgid "Error"
+#: ../src/video_tab.c:884
+msgid "Video Codec:"
 msgstr ""
 
-#: src/callbacks.c:128
-msgid ""
-"\n"
-"You have more than one video device installed.\n"
-"Do you want to try another one ?\n"
+#: ../src/video_tab.c:918
+msgid "Video Format:"
 msgstr ""
 
-#: src/callbacks.c:659
-msgid "start new"
+#: ../src/video_tab.c:924
+msgid "Take Video by Default"
 msgstr ""
 
-#: src/callbacks.c:662
-msgid "restart"
+#: ../src/video_tab.c:934
+msgid "---- Video Filters ----"
 msgstr ""
 
-#: src/callbacks.c:664
-msgid "new"
+#. Mirror
+#: ../src/video_tab.c:953
+msgid " Mirror"
 msgstr ""
 
-#: src/callbacks.c:666
-msgid "cancel"
+#. Upturn
+#: ../src/video_tab.c:964
+msgid " Invert"
 msgstr ""
 
-#: src/callbacks.c:671
-msgid ""
-"launch new process or restart?.\n"
-"\n"
+#. Negate
+#: ../src/video_tab.c:975
+msgid " Negative"
 msgstr ""
 
-#: src/callbacks.c:1344
-msgid "Load File"
+#. Mono
+#: ../src/video_tab.c:986
+msgid " Mono"
 msgstr ""
 
-#: src/timers.c:212
-msgid "Guvcview Warning:"
+#. Pieces
+#: ../src/video_tab.c:998
+msgid " Pieces"
 msgstr ""
 
-#: src/timers.c:212
-msgid "Not enough free space left on disk"
+#. Particles
+#: ../src/video_tab.c:1010
+msgid " Particles"
 msgstr ""

guvcview-src-1.5.3.tar.gz/po/he.po -> guvcview-src-1.6.1.tar.gz/po/he.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2009-10-19 04:31+0000\n"
 "Last-Translator: Paulo Assis <pj.assis@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -18,16 +18,16 @@
 "X-Launchpad-Export-Date: 2009-11-15 23:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr ""
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "פקדי GUVCViewer"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -37,7 +37,7 @@
 "\n"
 "לא יכול לפתוח התקן"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -46,33 +46,37 @@
 "ושמנהל ההתקן הנכון מותקן."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr ""
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
+"שגיאה בGuvcview:\n"
+"\n"
+"לא ניתן להקצות חוצץ"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
 "Make sure you run guvcview as root (or sudo)."
 msgstr ""
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -82,7 +86,7 @@
 "\n"
 "לא יכול להגדיר זרימת וידאו תקפה לguvcview"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -90,7 +94,7 @@
 "וודא שמנהל ההתקן שלך תואם v4l2\n"
 "ושהוא מותקן כהלכה."
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -100,11 +104,11 @@
 "\n"
 "לא ניתן להתחיל עם התקנה מינימאלית"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "אנא חבר מחדש את המצלמה."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -114,11 +118,11 @@
 "\n"
 "לא ניתן לבדוק את יכולות ההתקן"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "וודא שמנהל ההתקן שלך תואם v4l2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -128,11 +132,11 @@
 "\n"
 "קרא שגיאת שיטה"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "נסה את mmap במקום (--capture_method=1)."
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -142,48 +146,48 @@
 "\n"
 "לא ניתן להקצות חוצץ"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "נסה לאתחל את המערכת."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "פקדי תמונה"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "לכד:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "פרופילי בקרה:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr ""
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "עצור לכידה אוטומטית"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "לכד תמונה"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "עצור וידאו"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "לכד וידאו"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -193,697 +197,713 @@
 "\n"
 "לא יכול ליצור שרשור וידאו"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr "דווח על כך לhttp://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "פקדי משתמש"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "בהירות"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "ניגודיות"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "גוון"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "רוויה"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "חדות"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "גאמה"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "פיצוי אור אחורי"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "תדר חשמל"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "גוון, אוטומטי"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "מיקוד, אוטומטי"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "מצב ידני"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "מצב אוטומטי"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "מצב עדיפות צמצם"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
+#, fuzzy
 msgid "Aperture Priority Mode"
-msgstr ""
+msgstr "מצב עדיפות צמצם"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "רמת שחור"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "איזון לובן, אוטומטי"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
+#, fuzzy
 msgid "Do White Balance"
-msgstr ""
+msgstr "איזון האדום"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "איזון האדום"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "איזון הכחול"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "חשיפה"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "מרווח, אוטומטי"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "הישג"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "היפוך אופקי"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "היפוך אנכי"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "מרכז אופקי"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "מרכז אנכי"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr ""
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "פקדי מצלמה"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "חשיפה אוטומטית"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "זמן חשיפה, מוחלט"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
+#, fuzzy
 msgid "Pan, Relative"
-msgstr ""
+msgstr "נטייה, יחסי"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr "נטייה, יחסי"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
+#, fuzzy
 msgid "Pan, Reset"
-msgstr ""
+msgstr "נטייה, אפס"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr "נטייה, אפס"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
+#, fuzzy
 msgid "Pan, Absolute"
-msgstr ""
+msgstr "מיקוד, מוחלט"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "מיקוד, מוחלט"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "מיקוד, יחסי"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "מיקוד, אוטומטי"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
+#, fuzzy
 msgid "Zoom, Absolute"
-msgstr ""
+msgstr "מיקוד, מוחלט"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
+#, fuzzy
 msgid "Zoom, Relative"
-msgstr ""
+msgstr "מיקוד, יחסי"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
+#, fuzzy
 msgid "Zoom, Continuous"
-msgstr ""
+msgstr "מיקוד אוטומטי (מתמשך)"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "פרטיות"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "חשיפה, אוטומטי"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "חשיפה, עדיפות אוטומטית"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "חשיפה (מוחלטת)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "טמפרטורת איזון הלבן, אוטומטית"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "טפמרטורת איזון הלבן"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "רכיב איזון הלבן, אוטומטי"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "רכיב איזון הלבן הכחול"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "רכיב איזון הלבן האדום"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
+#, fuzzy
 msgid "Focus"
-msgstr ""
+msgstr "הגדר מיקוד"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
+#, fuzzy
 msgid "Focus (Absolute)"
-msgstr ""
+msgstr "מיקוד (מוחלט)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "שמור קובץ"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "קובץ מספר:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr "ערכי מקודד"
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "קצב סיביות:   "
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "וידאו וקבצים"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "התקן:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr ""
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " הצג"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "רזולוציה:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "פלט מצלמה:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "החל"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "איכות:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "קובץ תמונה:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "קובץ,אוטומטי"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "פורמט תמונה:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "קובץ וידאו:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "מקודד וידאו:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "מאפיינים"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "פורמט וידאו:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "--- מסנני וידאו ---"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " מראה"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " הפוך"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr ""
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " מונו"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr " חלקים"
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 #, fuzzy
 msgid " Particles"
 msgstr " חלקים"
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 #, fuzzy
 msgid "audio codec values"
 msgstr "ערכי מקודד"
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "שמע"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " קול"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr ""
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr ""
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr ""
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "קצב דגימה"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - מונו"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - סטריאו"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "ערוצים:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "פורמט שמע"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "--- אפקטים קוליים ---"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " הד"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr ""
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr ""
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr ""
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr ""
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "שמאל"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "ימין"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "למטה"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "למעלה"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "עצור לכידה אוטומטית"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
+#, fuzzy
 msgid "Pan (relative)"
-msgstr ""
+msgstr "נטייה, יחסי"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr "הטייה (יחסי)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
+#, fuzzy
 msgid "Pan Reset"
-msgstr ""
+msgstr "נטייה, אפס"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
 msgid "Tilt Reset"
 msgstr "איפוס הטייה"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
+#, fuzzy
 msgid "Pan/tilt Reset"
-msgstr ""
+msgstr "איפוס הטייה"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
+#, fuzzy
 msgid "Focus (absolute)"
 msgstr "מיקוד (מוחלט)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "מצב LED1"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "תדר LED1"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "בטל עיבוד וידאו"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr ""
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - מקובץ"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - YUV לא מקובץ"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - BMP לא מקובץ"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG וידאו 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - וידאו פלאש 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - וינדוס מדיה וידאו 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - פורמט MPG2"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MS MP4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr ""
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "מדפיס גרסה"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr ""
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "התקן וידאו לשימוש ברירת מחדל:/dev/video0"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "קובץ הגדרות"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "האצת חומרה (פעיל(1) | מנוטרל(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
 #, fuzzy
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
@@ -892,87 +912,89 @@
 "פורמט פיקסל(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|"
 "grey|s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "גודל פריים, ברירת מחדל: 640x480"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "שם קובץ תמונה"
 
-#: src/options.c:765
+#: ../src/options.c:773
+#, fuzzy
 msgid "Image capture interval in seconds"
-msgstr ""
+msgstr "זמן לכידת וידאו (בשניות)"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "מספר תמונות ללכידה"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "שם קובץ וידאו (לוכד מההתחלה)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "זמן לכידת וידאו (בשניות)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr "יוצא מguvcview אחרי סגירת וידאו"
 
-#: src/options.c:770
+#: ../src/options.c:778
+#, fuzzy
 msgid "Number of initial frames to skip"
-msgstr ""
+msgstr "מספר תמונות ללכידה"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "מראה ערך פריימים לשניה (FPS) (פעיל(1) | מנוטרל(2))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "טען פרופיל בהפעלה"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- אפשרויות מקומיות"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "מיקוד אוטומטי (מתמשך)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "הגדר מיקוד"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 #, fuzzy
 msgid "Error"
 msgstr " מראה"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "הפעל עכשיו"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "הפעל מחדש"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "חדש"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "בטל"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -980,18 +1002,30 @@
 "הפעל תהליך חדש או הפעל מחדש?.\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "טען קובץ"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr ""
 
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
+
 #~ msgid "PCM"
 #~ msgstr "PCM"

guvcview-src-1.5.3.tar.gz/po/hr.po -> guvcview-src-1.6.1.tar.gz/po/hr.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2010-12-03 18:33+0000\n"
 "Last-Translator: Dino Lovaković <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -18,16 +18,16 @@
 "X-Launchpad-Export-Date: 2011-01-19 14:28+0000\n"
 "X-Generator: Launchpad (build 12214)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Guvcview Snimanje Videa"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "GUVCViewer Kontrole"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -37,7 +37,7 @@
 "\n"
 "Nije moguče pokrenuti uređaj"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -46,7 +46,7 @@
 "i dali je instaliran ispravan driver."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -56,12 +56,12 @@
 "\n"
 "UVC kontrole Ekstenzije"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "Kontrole Ekstenzije su dodane UVC driveru"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -71,7 +71,7 @@
 "\n"
 "UVC kontrole Ekstenzije"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -81,7 +81,7 @@
 "ekstenzije UVC driveru\n"
 "Pokrenite guvcview kao root (ili sudo)."
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -91,7 +91,7 @@
 "\n"
 "Nije moguče postaviti vrijedeći video stream za guvcview"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -99,7 +99,7 @@
 "Provjerite dali vaš video driver ima podršku za v4l2\n"
 "i pogledajte dali je ispravno instaliran."
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -109,11 +109,11 @@
 "\n"
 "Nije moguče pokretanje s minimalnim postavkama"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Molim ponovno spajanje kamere."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -123,827 +123,857 @@
 "\n"
 "Sposobnost uređaja nije čitljiva"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Provjerite da vaš driver ima podršku za v4l2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Read method error"
 msgstr ""
+"Guvcview grješka:\n"
+"\n"
+"Nije moguče pokrenuti uređaj"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr ""
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to allocate Buffers"
 msgstr ""
+"Guvcview grješka:\n"
+"\n"
+"Nije moguče pokrenuti uređaj"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Probajte ponovno pokrenuti vaš sustav."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Kontrole Slike"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Snimi:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Upravljački Profili:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "Zadano"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Zaustavi Automatsko"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Snimi Sliku"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Zaustavi Video"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Snimi Video"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to create Video Thread"
 msgstr ""
+"Guvcview grješka:\n"
+"\n"
+"Nije moguče pokrenuti uređaj"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr "Molimo prijavite na http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "Korisničke Kontrole"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Osvjetljenje"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Nijansa"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Zasićenje"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Oštrina"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gama"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Ispravke pozadinskog osvjetljenja"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr ""
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
+#, fuzzy
 msgid "Hue, Automatic"
-msgstr ""
+msgstr "Fokusiranje, Automatsko"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Fokusiranje, Automatsko"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Ručni Način"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Automatski Način"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Razina Crne boje"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Ravnoteža Bijele, Automatski"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "Uredi Ravnotežu Bijele"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Ravnoteža Crvene"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Ravnoteža Plave"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Izloženost"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
+#, fuzzy
 msgid "Gain, Automatic"
-msgstr ""
+msgstr "Fokusiranje, Automatsko"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Dobit"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Vodoravno Okretanje"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Okomito Okretanje"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "Vodoravno Centriraj"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "Okomito Centriraj"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Efekti Boje"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "Kontrole Kamere"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Automatska Izloženost"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "Vrijeme Izloženosti, Apsolutno"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr "Izloženost, Broj Slika"
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
+#, fuzzy
 msgid "Pan, Relative"
-msgstr ""
+msgstr "Približavanje, Relativno"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
+#, fuzzy
 msgid "Tilt, Relative"
-msgstr ""
+msgstr "Približavanje, Relativno"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr ""
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr ""
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
+#, fuzzy
 msgid "Pan, Absolute"
-msgstr ""
+msgstr "Približavanje, Apsolutno"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "Fokusiranje, Apsolutno"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "Fokusiranje, Relativno"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Fokusiranje, Automatsko"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr "Približavanje, Apsolutno"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr "Približavanje, Relativno"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr "Približavanje, Neprestano"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "Privatnost"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Izloženost, Automatsko"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
+#, fuzzy
 msgid "Exposure, Auto Priority"
-msgstr ""
+msgstr "Izloženost, Automatsko"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Izloženost (Apsolutna)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
+#, fuzzy
 msgid "White Balance Temperature, Auto"
-msgstr ""
+msgstr "Ravnoteža Bijele, Automatski"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
+#, fuzzy
 msgid "White Balance Temperature"
-msgstr ""
+msgstr "Ravnoteža Bijele, Automatski"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
+#, fuzzy
 msgid "White Balance Component, Auto"
-msgstr ""
+msgstr "Ravnoteža Bijele, Automatski"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
+#, fuzzy
 msgid "White Balance Blue Component"
-msgstr ""
+msgstr "Ravnoteža Bijele, Automatski"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
+#, fuzzy
 msgid "White Balance Red Component"
-msgstr ""
+msgstr "Ravnoteža Bijele, Automatski"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Fokusiranje"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
+#, fuzzy
 msgid "Focus (Absolute)"
-msgstr ""
+msgstr "Fokusiranje, Apsolutno"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Spremi Datoteku"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr ""
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr ""
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr ""
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr ""
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Uređaj:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Broj Slika:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Prikaži"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Razlučivost:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr ""
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Primjeni"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Kvaliteta:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr ""
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr ""
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Format Slike:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr ""
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Video Codec:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "svojstva"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Video Format:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Video Filteri ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Zrcalo"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Izokrenuto"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Negativ"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Mono"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr " Komadići"
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr " Čestice"
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr "vrijednosti audio codeca"
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Audio"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Zvuk"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr ""
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Ulazni uređaj:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Zadane Postavke Uređaja"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr ""
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Kanali:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Audio Format:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Audio Efekti ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Jeka"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr " Mutno"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Odjek"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr ""
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr " Patka"
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Lijevo"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Desno:"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Dolje"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Gore"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "Zaustavi Automatsko"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
+#, fuzzy
 msgid "Pan (relative)"
-msgstr ""
+msgstr "Približavanje, Relativno"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
+#, fuzzy
 msgid "Tilt (relative)"
-msgstr ""
+msgstr "Približavanje, Relativno"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
 msgid "Pan Reset"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
+#, fuzzy
 msgid "Tilt Reset"
-msgstr ""
+msgstr "Približavanje, Relativno"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
+#, fuzzy
 msgid "Focus (absolute)"
-msgstr ""
+msgstr "Fokusiranje, Apsolutno"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr ""
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr ""
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr ""
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr ""
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG video 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - flash video 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - win. med. video 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - MPG2 format"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MS MP4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr "MPEG4-ASP"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr "MPEG4-AVC (H264)"
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "Isprintaj verziju"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr ""
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Video uređaj rabljen zadani: /dev/video0"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr "Izlaz nakon dodavanja UVC ekstenzivnih kontrola (potreban root/sudo)"
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "Datoteka Postavki"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "Hardversko ubrzanje (omoguči(1) | onemoguči(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Veličina slike, zadana: 640x480"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Ime Slikovne Datoteke"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "Interval slikanja u sekundama"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Broj Slika za snimiti"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "Ime Video Datoteke (snimka od početka)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "Vrijeme snimanja videa (u sekundama)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr "Izlaz iz guvcviewa nakon zatvaranja videa"
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr "Broj preskočenih početnih slika"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "Prikaz FPS broja (omoguči(1) | onemoguči (0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Učitaj Profil pri pokretanju"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- lokalne opcije"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Automatski Focus (neprekidno)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "postavi fokusiranje"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr "Grješka"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
@@ -953,23 +983,23 @@
 "Imate više uređaja instalirano.\n"
 "Želite li isprobati ostale?\n"
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "pokreni novo"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "ponovo pokreni"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "novo"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "odustani"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -977,18 +1007,30 @@
 "upalite novi proces ili ponovno pokrenite?.\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Učitaj Datoteku"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr "Guvcview Upozorenje"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "Nema dovoljno slobodnog prostora na disku"
 
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
+
 #~ msgid ""
 #~ "An error ocurred while adding extension\n"
 #~ "controls to the UVC driver\n"

guvcview-src-1.5.3.tar.gz/po/it.po -> guvcview-src-1.6.1.tar.gz/po/it.po Changed

@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-10 13:38+0100\n"
-"PO-Revision-Date: 2012-01-17 21:00+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
+"PO-Revision-Date: 2012-04-05 10:00+0100\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
 "Language: it\n"
@@ -17,16 +17,16 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/guvcview.c:288
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Cattura video di Guvcview"
 
-#: src/guvcview.c:300
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "Controlli di Guvcview"
 
 #. can't open device
-#: src/guvcview.c:328
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -36,7 +36,7 @@
 "\n"
 "Impossibile accedere al dispositivo"
 
-#: src/guvcview.c:329
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -45,7 +45,7 @@
 "e che sia installato il rispettivo driver."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:334
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -55,12 +55,12 @@
 "\n"
 "Controlli dell'estensione di UVC"
 
-#: src/guvcview.c:335
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "I controlli dell'estensione sono stati aggiunti al driver UVC"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:342
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -70,7 +70,7 @@
 "\n"
 "Controlli dell'estensione di UVC"
 
-#: src/guvcview.c:343
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -80,7 +80,7 @@
 "i controlli dell'estensione al driver UVC\n"
 "Assicurarsi di avviare guvcview da root (o sudo)."
 
-#: src/guvcview.c:369 src/guvcview.c:447
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -90,7 +90,7 @@
 "\n"
 "Impossibile impostare un flusso video valido per guvcview"
 
-#: src/guvcview.c:370 src/guvcview.c:448
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -98,7 +98,7 @@
 "Assicurarsi che il driver del dispositivo sia\n"
 "v4l2 compatibile e che sia correttamente installato."
 
-#: src/guvcview.c:392 src/guvcview.c:414
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -108,11 +108,11 @@
 "\n"
 "Impossibile avviare con l'installazione minima"
 
-#: src/guvcview.c:393 src/guvcview.c:415
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Riconnettere la webcam."
 
-#: src/guvcview.c:422
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -122,11 +122,11 @@
 "\n"
 "Impossibile interrogare le funzionalità del dispositivo"
 
-#: src/guvcview.c:423
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Assicurarsi che il driver del dispositivo supporti v4l2."
 
-#: src/guvcview.c:427
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -136,11 +136,11 @@
 "\n"
 "Errore del metodo di lettura"
 
-#: src/guvcview.c:428
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "In alternativa, provare mmap (--capture_method=1)."
 
-#: src/guvcview.c:436
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -150,48 +150,48 @@
 "\n"
 "Impossibile allocare i buffer"
 
-#: src/guvcview.c:437
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Provare a riavviare il sistema."
 
-#: src/guvcview.c:476
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Controlli dell'immagine"
 
-#: src/guvcview.c:511
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Cattura:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:519
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Profili di controllo:"
 
-#: src/guvcview.c:534
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "Ripristina"
 
 #. image auto capture
-#: src/guvcview.c:547
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Arresto automatico"
 
-#: src/guvcview.c:551 src/callbacks.c:1109 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Cattura immagine"
 
 #. vid capture enabled from start
-#: src/guvcview.c:556 src/callbacks.c:1251
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Ferma il video"
 
-#: src/guvcview.c:561 src/guvcview.c:777 src/callbacks.c:1185
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Registra video"
 
-#: src/guvcview.c:717
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -201,257 +201,259 @@
 "\n"
 "Impossibile creare un flusso video"
 
-#: src/guvcview.c:718
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
-msgstr "Siete pregati di segnalarlo a http://developer.berlios.de/bugs/?group_id=8179"
+msgstr ""
+"Siete pregati di segnalarlo a http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "Controlli dell'utente"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Luminosità"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Contrasto"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Colore"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Saturazione"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Nitidezza"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Compensazione del controluce"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "Frequenza di aggiornamento"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "Colore automatico"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Messa a fuoco automatica"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Modalità manuale"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Modalità automatica"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Modalità di priorità dell'otturatore"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "Modalità di priorità dell'apertura"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Livello del nero"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Bilanciamento automatico del bianco"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "Bilanciamento del bianco"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Bilanciamento del rosso"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Bilanciamento del blu"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Esposizione"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "Guadagno automatico"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Guadagno"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Rifletti orizzontalmente"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Rifletti verticalmente"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "Centra orizzontalmente"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "Centra verticalmente"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr "Chroma AGC"
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr "Killer del colore"
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Effetti del colore"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "Controlli della webcam"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Esposizione automatica"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "Tempo di esposizione assoluto"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr "Esposizione, framerate dinamico"
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr "Panoramica relativa"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr "Inclinazione relativa"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr "Ripristina la panoramica"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr "Ripristina l'inclinazione"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr "Panoramica assoluta"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "Messa a fuoco assoluta"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "Messa a fuoco relativa"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Messa a fuoco automatica"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr "Zoom assoluto"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr "Zoom relativo"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr "Zoom continuo"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "Privacy"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Esposizione automatica"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Esposizione, priorità automatica"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Esposizione (assoluta)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Bilanciamento del bianco automatico"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Bilanciamento del bianco"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Bilanciamento dei componenti del bianco automatico"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "Bilanciamento del bianco, canale blu"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "Bilanciamento del bianco, canale rosso"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Messa a fuoco"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr "Messa a fuoco (assoluta)"
 
-#: src/video_tab.c:41 src/callbacks.c:1293
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Salva file"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:322 src/options.c:437 src/options.c:494 src/callbacks.c:600
-#: src/callbacks.c:881 src/callbacks.c:1030 src/callbacks.c:1047
-#: src/callbacks.c:1083 src/callbacks.c:1197 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "File numero: %d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr "valori dei codec"
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
@@ -459,486 +461,505 @@
 "                              encoder fps:   \n"
 " (0 - usare il valore fps della combobox)"
 
+#: ../src/video_tab.c:150
+msgid " monotonic pts"
+msgstr " punti monocromatici"
+
 #. bit rate
-#: src/video_tab.c:152 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "bit rate:   "
 
-#: src/video_tab.c:167
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr "qmax:   "
 
-#: src/video_tab.c:182
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr "qmin:   "
 
-#: src/video_tab.c:197
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr "max. qdiff:   "
 
-#: src/video_tab.c:212
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr "dim. dia:   "
 
-#: src/video_tab.c:227
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr "dim. pre dia:   "
 
-#: src/video_tab.c:242
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr "pre me:   "
 
-#: src/video_tab.c:257
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr "pre cmp:   "
 
-#: src/video_tab.c:272
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr "cmp:   "
 
-#: src/video_tab.c:287
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr "sub cmp:   "
 
-#: src/video_tab.c:302
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr "conteggio dell'ultimo indicatore:   "
 
-#: src/video_tab.c:317
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr "dim. gop:   "
 
-#: src/video_tab.c:332
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr "qcompress:   "
 
-#: src/video_tab.c:347
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr "qblur:   "
 
-#: src/video_tab.c:362
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr "subq:   "
 
-#: src/video_tab.c:377
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr "framerefs:   "
 
-#: src/video_tab.c:392
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr "metodo me:   "
 
-#: src/video_tab.c:407
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr "decisione mb:   "
 
-#: src/video_tab.c:422
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr "numero massimo di immagini B:   "
 
-#: src/video_tab.c:530
+#: ../src/video_tab.c:404
+msgid "num threads:   "
+msgstr "numero di thread:   "
+
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Video e file"
 
 #. Devices
-#: src/video_tab.c:546 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Dispositivo:"
 
-#: src/video_tab.c:648
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Frame rate:"
 
-#: src/video_tab.c:656
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Visualizza"
 
-#: src/video_tab.c:680
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Risoluzione:"
 
-#: src/video_tab.c:706
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Uscita della webcam:"
 
-#: src/video_tab.c:728
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Applica"
 
-#: src/video_tab.c:736
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Qualità:"
 
-#: src/video_tab.c:746
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "File immagine:"
 
-#: src/video_tab.c:779 src/video_tab.c:863
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "Numerazione automatica dei file"
 
-#: src/video_tab.c:790
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Formato dell'immagine:"
 
-#: src/video_tab.c:818
+#: ../src/video_tab.c:797
+msgid "Take Picture by Default"
+msgstr "Prendi l'immagine predefinita"
+
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "File video:"
 
-#: src/video_tab.c:896
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Codec video:"
 
 #. lavc codec properties button
-#: src/video_tab.c:904 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "proprietà"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Formato video:"
 
-#: src/video_tab.c:940
+#: ../src/video_tab.c:924
+msgid "Take Video by Default"
+msgstr "Prendi il video predefinito"
+
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Filtri video ----"
 
 #. Mirror
-#: src/video_tab.c:955
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Specchio"
 
 #. Upturn
-#: src/video_tab.c:965
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Inverti"
 
 #. Negate
-#: src/video_tab.c:975
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Negativo"
 
 #. Mono
-#: src/video_tab.c:985
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Monocromatico"
 
 #. Pieces
-#: src/video_tab.c:996
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr " Pezzi"
 
 #. Particles
-#: src/video_tab.c:1007
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr " Particelle"
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr "valori del codec audio"
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Audio"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Suono"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr " Visualizza VU meter"
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "API dell'audio:"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "PORTAUDIO"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Dispositivo di ingresso:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Impostazione predefinita del dispositivo"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "Frequenza di campionamento:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Canali:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Formato audio:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Effetti audio ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Eco"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr " Rumore"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Riverbero"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " WahWah"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr " Anatroccolo"
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Sinistra"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Destra"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Sotto"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Sopra"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr "Spento"
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr "Acceso"
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr "Lampeggiante"
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 msgid "Auto"
 msgstr "Automatico"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr "8 bit"
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr "12 bit"
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr "Panoramica (relativa)"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr "Inclinazione (relativa)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
 msgid "Pan Reset"
 msgstr "Ripristina la panoramica"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
 msgid "Tilt Reset"
 msgstr "Ripristina l'inclinazione"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "Ripristina panoramica e inclinazione"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr "Messa a fuoco (assoluta)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "Modalità LED1"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "Frequenza LED1"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "Disabilita l'elaborazione video"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Raw bit per pixel"
 
-#: src/vcodecs.c:57
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - compresso"
 
-#: src/vcodecs.c:90
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - YUV non compresso"
 
-#: src/vcodecs.c:123
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - BMP non compresso"
 
-#: src/vcodecs.c:156
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG video 1"
 
-#: src/vcodecs.c:189
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - flash video 1"
 
-#: src/vcodecs.c:222
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - win. med. video 7"
 
-#: src/vcodecs.c:255
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - formato MPG2"
 
-#: src/vcodecs.c:288
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MS MP4 V3"
 
-#: src/vcodecs.c:321
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr "MPEG4-ASP"
 
-#: src/vcodecs.c:354
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr "MPEG4-AVC (H264)"
 
-#: src/options.c:734
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "Visualizza la versione"
 
-#: src/options.c:735
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Visualizza le informazioni di debug"
 
-#: src/options.c:736
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Dispositivo video da utilizzare predefinito: /dev/video0"
 
-#: src/options.c:737
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
-msgstr "Uscire dopo aver aggiunto i controlli dell'estensione di UVC (necessita di root/sudo)"
+msgstr ""
+"Uscire dopo aver aggiunto i controlli dell'estensione di UVC (necessita di "
+"root/sudo)"
 
-#: src/options.c:738
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr "Non attivare il flusso video (solo controlli dell'immagine)"
 
-#: src/options.c:739
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr "Non visualizzare la GUI"
 
-#: src/options.c:740
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr "Metodo di registrazione (1-mmap (predefinito)  2-read)"
 
-#: src/options.c:741
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "File di configurazione"
 
-#: src/options.c:742
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "Accelerazione hardware (abilita(1) | disabilita(0))"
 
-#: src/options.c:743
+#: ../src/options.c:770
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
-"Formato dei pixel(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
-"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+"Formato dei pixel(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|"
+"nv61|y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:744
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Risoluzione predefinita: 640x480"
 
-#: src/options.c:745
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Nome del file immagine"
 
-#: src/options.c:746
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "Intervallo di registrazione dell'immagine in secondi"
 
-#: src/options.c:747
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Numero di immagini da registrare"
 
-#: src/options.c:748
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "Nome del file video (registra dall'inizio)"
 
-#: src/options.c:749
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "Durata della registrazione video (in secondi)"
 
-#: src/options.c:750
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr "Esci da guvcview dopo aver chiuso il video"
 
-#: src/options.c:751
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr "Numero di immagini iniziali da ignorare"
 
-#: src/options.c:752
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "Mostra il valore degli FPS (abilita(1) | disabilita (0))"
 
-#: src/options.c:753
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Carica profilo all'avvio"
 
-#: src/options.c:759
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- opzioni locali"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Messa a fuoco automatica (continua)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "imposta la messa a fuoco"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr "Errore"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
@@ -948,23 +969,23 @@
 "C'è più di un dispositivo video installato.\n"
 "Vuoi provare l'altro ?\n"
 
-#: src/callbacks.c:651
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "inizia nuovo"
 
-#: src/callbacks.c:654
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "riavvia"
 
-#: src/callbacks.c:656
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "nuovo"
 
-#: src/callbacks.c:658
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "annulla"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -972,14 +993,26 @@
 "vuoi lanciare un nuovo processo o riavviare?.\n"
 "\n"
 
-#: src/callbacks.c:1306
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Carica file"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr "Avviso di Guvcview:"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "Spazio libero sul disco insufficiente"
+
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr "Un visualizzatore e catturatore video per il driver uvc di linux"
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr "GTK UVC visualizzatore video"
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr "guvcview"

guvcview-src-1.5.3.tar.gz/po/ja.po -> guvcview-src-1.6.1.tar.gz/po/ja.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GUVCView 1.0.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2009-09-15 02:40+0000\n"
 "Last-Translator: Paulo Assis <pj.assis@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,16 +20,16 @@
 "X-Poedit-Country: JAPAN\n"
 "X-Poedit-Language: Japanese\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr ""
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "GUVCViewer コントロール"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -39,53 +39,57 @@
 "\n"
 "デバイスをオープンすることができません"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
 msgstr ""
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr ""
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
+"Guvcview エラー:\n"
+"\n"
+"バッファを確保できません"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
 "Make sure you run guvcview as root (or sudo)."
 msgstr ""
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Can't set a valid video stream for guvcview"
 msgstr ""
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
 msgstr ""
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -95,33 +99,41 @@
 "\n"
 "最小限のセットアップから始めることができません"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "カメラを再接続してください。"
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Couldn't query device capabilities"
 msgstr ""
+"Guvcview エラー:\n"
+"\n"
+"デバイスをオープンすることができません"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr ""
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
+#, fuzzy
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Read method error"
 msgstr ""
+"Guvcview エラー:\n"
+"\n"
+"デバイスをオープンすることができません"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr ""
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -131,49 +143,49 @@
 "\n"
 "バッファを確保できません"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "システムを再起動してみてください。"
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "イメージコントロール"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "キャプチャ:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "コントロールプロファイル:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 #, fuzzy
 msgid "Defaults"
 msgstr "デバイス デフォルト"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "自動停止"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "キャプチャ.画像"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr ""
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr ""
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -183,697 +195,724 @@
 "\n"
 "ビデオスレッドを作成することができません"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 "http://developer.berlios.de/bugs/?group_id=8179 にレポートしてください。"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
+#, fuzzy
 msgid "User Controls"
-msgstr ""
+msgstr "GUVCViewer コントロール"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "輝度"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "コントラスト"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "色相"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "彩度"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "鮮明度"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "ガンマ"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "バックライト補正"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "電源ライン周波数"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
+#, fuzzy
 msgid "Hue, Automatic"
-msgstr ""
+msgstr "色相、自動"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "フォーカス,自動"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "手動モード"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "自動モード"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "シャッター優先モード"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "絞り優先モード"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr ""
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
+#, fuzzy
 msgid "White Balance, Automatic"
-msgstr ""
+msgstr "ホワイトバランス成分、自動"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
+#, fuzzy
 msgid "Do White Balance"
-msgstr ""
+msgstr "ホワイトバランス温度"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
+#, fuzzy
 msgid "Exposure"
-msgstr ""
+msgstr "露出:"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "ゲイン"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr ""
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr ""
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr ""
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
+#, fuzzy
 msgid "Camera Controls"
-msgstr ""
+msgstr "イメージコントロール"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
+#, fuzzy
 msgid "Auto Exposure"
-msgstr ""
+msgstr "露出:"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
+#, fuzzy
 msgid "Exposure Time, Absolute"
-msgstr ""
+msgstr "Exposure (完全な)"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
+#, fuzzy
 msgid "Pan, Relative"
-msgstr ""
+msgstr "パン (相対)"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
+#, fuzzy
 msgid "Tilt, Relative"
-msgstr ""
+msgstr "チルト (相対)"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
+#, fuzzy
 msgid "Pan, Reset"
-msgstr ""
+msgstr "パン リセット"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
+#, fuzzy
 msgid "Tilt, Reset"
-msgstr ""
+msgstr "チルト リセット"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
+#, fuzzy
 msgid "Focus, Absolute"
-msgstr ""
+msgstr "フォーカス (完全な)"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
+#, fuzzy
 msgid "Focus, Relative"
-msgstr ""
+msgstr "フォーカス,自動"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
+#, fuzzy
 msgid "Focus, Automatic"
-msgstr ""
+msgstr "フォーカス,自動"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
+#, fuzzy
 msgid "Zoom, Absolute"
-msgstr ""
+msgstr "Exposure (完全な)"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
+#, fuzzy
 msgid "Zoom, Relative"
-msgstr ""
+msgstr " ネガ"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
+#, fuzzy
 msgid "Zoom, Continuous"
-msgstr ""
+msgstr "オートフォーカス(連続)"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr ""
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "露出、自動"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "露出、自動優先"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Exposure (完全な)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "ホワイトバランス温度、自動"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "ホワイトバランス温度"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "ホワイトバランス成分、自動"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "ホワイトバランス青成分"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "ホワイトバランス赤成分"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
+#, fuzzy
 msgid "Focus"
-msgstr ""
+msgstr "フォーカスを設定する"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
+#, fuzzy
 msgid "Focus (Absolute)"
-msgstr ""
+msgstr "フォーカス (完全な)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "ファイルを保存する"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "ファイル番号:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr ""
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr ""
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "ビデオ & ファイル"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "デバイス:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "フレームレート:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " 表示"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "解像度:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "カメラ出力:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr ""
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr ""
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "画像ファイル:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "ファイル,自動"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "画像フォーマット:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr ""
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr ""
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr ""
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr ""
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- ビデオフィルタ ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " 鏡"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " 反転"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " ネガ"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " モノクロ"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr " 断片"
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 #, fuzzy
 msgid " Particles"
 msgstr " 断片"
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "オーディオ"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " サウンド"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr ""
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "入力デバイス:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "デバイス デフォルト"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "サンプルレート:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - モノラル"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - ステレオ"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "チャンネル:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "音楽フォーマット:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- オーディオ エフェクト ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Echo"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr " Fuzz"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Reverb"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " WahWah"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr " Ducky"
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "左"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "右"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "下"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "上"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "自動停止"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
+#, fuzzy
 msgid "Pan (relative)"
 msgstr "パン (相対)"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
+#, fuzzy
 msgid "Tilt (relative)"
 msgstr "チルト (相対)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
+#, fuzzy
 msgid "Pan Reset"
 msgstr "パン リセット"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
+#, fuzzy
 msgid "Tilt Reset"
 msgstr "チルト リセット"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "パン/チルト リセット"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
+#, fuzzy
 msgid "Focus (absolute)"
 msgstr "フォーカス (完全な)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "LED1 モード"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "LED1 回数"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "ビデオ処理 を無効にする"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "1画素あたりの生のビット"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - 圧縮"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - 非圧縮 YUV"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - 非圧縮 BMP"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr ""
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr ""
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr ""
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr ""
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr ""
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr ""
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "バージョンを表示する"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "デバッグ情報を表示する"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "使用するビデオデバイス デフォルト: /dev/video0"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "設定ファイル"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "ハードウェアアクセラレーション (有効(1) | 無効(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
 #, fuzzy
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
@@ -882,87 +921,89 @@
 "ピクセルフォーマット (mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|"
 "nv61|y41p|grey|s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "フレームサイズ、デフォルト: 640x480"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "画像ファイル名"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "秒単位の画像キャプチャ間隔"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "キャプチャする画像数"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr ""
 
-#: src/options.c:768
+#: ../src/options.c:776
+#, fuzzy
 msgid "Video capture time (in seconds)"
-msgstr ""
+msgstr "秒単位の画像キャプチャ間隔"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
+#, fuzzy
 msgid "Number of initial frames to skip"
-msgstr ""
+msgstr "キャプチャする画像数"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "FPS 値の表示 (有効(1) | 無効 (0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "開始時にプロファイルを読み込む"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- ローカルオプション"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "オートフォーカス(連続)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "フォーカスを設定する"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 #, fuzzy
 msgid "Error"
 msgstr " 鏡"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "新しく開始する"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "再起動"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "新規"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "キャンセル"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -970,18 +1011,30 @@
 "新しいプロセスを立ち上げるか、再起動しますか?\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "ファイルを読込む"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr ""
 
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
+
 #~ msgid "PCM"
 #~ msgstr "PCM"
 
@@ -997,9 +1050,6 @@
 #~ msgid "raw pixel order:"
 #~ msgstr "raw ピクセルの順序:"
 
-#~ msgid "Hue, Auto"
-#~ msgstr "色相、自動"
-
 #~ msgid "AVI File:"
 #~ msgstr "AVI ファイル:"
 
@@ -1009,9 +1059,6 @@
 #~ msgid "AVI Format:"
 #~ msgstr "AVI フォーマット:"
 
-#~ msgid "Exposure:"
-#~ msgstr "露出:"
-
 #~ msgid "Program Restart"
 #~ msgstr "プログラム再起動"

guvcview-src-1.5.3.tar.gz/po/linguas -> guvcview-src-1.6.1.tar.gz/po/linguas Changed

guvcview-src-1.5.3.tar.gz/po/nl.po -> guvcview-src-1.6.1.tar.gz/po/nl.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2009-09-15 02:57+0000\n"
 "Last-Translator: Paulo Assis <pj.assis@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -18,930 +18,947 @@
 "X-Launchpad-Export-Date: 2009-11-15 23:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr ""
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr ""
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to open device"
 msgstr ""
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
 msgstr ""
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr ""
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
 "Make sure you run guvcview as root (or sudo)."
 msgstr ""
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Can't set a valid video stream for guvcview"
 msgstr ""
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
 msgstr ""
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to start with minimum setup"
 msgstr ""
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Sluit uw camera opnieuw aan a.u.b."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Couldn't query device capabilities"
 msgstr ""
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr ""
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Read method error"
 msgstr ""
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr ""
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to allocate Buffers"
 msgstr ""
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr ""
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr ""
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Opnemen:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr ""
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr ""
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Stop Auto"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Afbeelding vastleggen"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Stop Video"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Video Vastleggen"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to create Video Thread"
 msgstr ""
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr ""
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Helderheid"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "contrast"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Tint"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Verzadiging"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Scherpte"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "achtergrondverlichtingscompensatie"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
+#, fuzzy
 msgid "Power Line Frequency"
-msgstr ""
+msgstr "LED1 Frequentie"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
+#, fuzzy
 msgid "Hue, Automatic"
-msgstr ""
+msgstr "Tint, Auto"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
+#, fuzzy
 msgid "Focus, Auto"
-msgstr ""
+msgstr "Tint, Auto"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
+#, fuzzy
 msgid "Auto Mode"
-msgstr ""
+msgstr "Stop Auto"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr ""
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
+#, fuzzy
 msgid "Exposure"
-msgstr ""
+msgstr "Belichting, Auto"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr ""
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr ""
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr ""
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr ""
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr ""
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr ""
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
+#, fuzzy
 msgid "Exposure Time, Absolute"
-msgstr ""
+msgstr "Belichting, Auto"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
+#, fuzzy
 msgid "Pan, Reset"
-msgstr ""
+msgstr "Reset"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
+#, fuzzy
 msgid "Tilt, Reset"
-msgstr ""
+msgstr "Reset"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr ""
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr ""
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Belichting, Auto"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
+#, fuzzy
 msgid "Exposure, Auto Priority"
-msgstr ""
+msgstr "Belichting, Auto"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
+#, fuzzy
 msgid "Exposure (Absolute)"
-msgstr ""
+msgstr "Belichting, Auto"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr ""
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr ""
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr ""
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr ""
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr ""
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Bestand Opslaan"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr ""
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr ""
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "bitrate:   "
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr ""
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr ""
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr ""
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr ""
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr ""
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr ""
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr ""
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr ""
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr ""
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr ""
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr ""
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr ""
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr ""
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr ""
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr ""
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr ""
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr ""
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr ""
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr ""
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr ""
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr ""
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr ""
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr ""
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Geluid"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "Audio API:"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "PORTAUDIO"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Invoerapparaat:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr ""
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr ""
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Kanalen:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Audioformaat"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Audio Effecten ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Echo"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr ""
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr ""
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " WahWah"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr ""
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Links"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Rechts"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Beneden"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "Stop Auto"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
+#, fuzzy
 msgid "Pan Reset"
-msgstr ""
+msgstr "Reset"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
+#, fuzzy
 msgid "Tilt Reset"
-msgstr ""
+msgstr "Reset"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
+#, fuzzy
 msgid "Pan/tilt Reset"
-msgstr ""
+msgstr "Reset"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
+#, fuzzy
 msgid "Focus (absolute)"
-msgstr ""
+msgstr "Belichting, Auto"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "LED1 Mode"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
+#, fuzzy
 msgid "LED1 Frequency"
 msgstr "LED1 Frequentie"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr ""
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr ""
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr ""
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr ""
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG video 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - flash video 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - win. med. video 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - MPG2 formaat"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MS MP4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr ""
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr ""
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr ""
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr ""
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr ""
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr ""
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr ""
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr ""
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr ""
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr ""
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr ""
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr ""
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr ""
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr ""
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr ""
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr ""
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr ""
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr ""
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr ""
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "start nieuw"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "herstarten"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "nieuw"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "annuleren"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -949,18 +966,30 @@
 "nieuw proces starten of herstarten\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Bestand Openen"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr ""
 
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
+
 #~ msgid "PCM"
 #~ msgstr "PCM"
 
@@ -970,12 +999,6 @@
 #~ msgid "MPEG4 - MPEG4 format"
 #~ msgstr "MPEG4 - MPEG4 formaat"
 
-#~ msgid "Reset"
-#~ msgstr "Reset"
-
-#~ msgid "Hue, Auto"
-#~ msgstr "Tint, Auto"
-
 #~ msgid "Program Restart"
 #~ msgstr "Programma Herstart"

guvcview-src-1.5.3.tar.gz/po/pl.po -> guvcview-src-1.6.1.tar.gz/po/pl.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2011-01-04 16:40+0000\n"
 "Last-Translator: Adam Czabara <kolofaza@o2.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -18,16 +18,16 @@
 "X-Launchpad-Export-Date: 2011-01-19 15:36+0000\n"
 "X-Generator: Launchpad (build 12214)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Przechwytywanie wideo Guvcview"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "Kontrolki GUVCViewer"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -37,7 +37,7 @@
 "\n"
 "Nie można otworzyć urządzenia"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -46,7 +46,7 @@
 "oraz czy jest zainstalowany odpowiedni sterownik."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -56,12 +56,12 @@
 "\n"
 "Kontrolki rozszerzenia UVC"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "Kontrolki rozszerzenia zostały dodane do steronika UVC"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -71,7 +71,7 @@
 "\n"
 "Kontrolki rozszerzenia UVC"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -81,7 +81,7 @@
 "rozszerzenia sterownika UVC\n"
 "Guvciew musi być uruchomiony w trybie root(lub sudo)."
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -90,7 +90,7 @@
 "Błąd Guvcview:\n"
 "Nie można ustanowić prawidłowego strumienia wideo dla guvcview"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -98,7 +98,7 @@
 "Upewnij się, że twoje urządzenie jest kompatybilne z v4l2\n"
 "i jest poprawnie zainstalowane."
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -108,11 +108,11 @@
 "\n"
 "Nie można uruchomić minimalnej konfiguracji"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Ponownie podłącz kamerę."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -122,11 +122,11 @@
 "\n"
 "Nie można pobrać listy kompatybilnych urządzeń"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Upewnij się, że urządzenie obsługuje v4l2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -136,11 +136,11 @@
 "\n"
 "Błąd metody odczytu"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "Proszę spróbować mmap zamiast (--capture_method=1)."
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -150,48 +150,48 @@
 "\n"
 "Błąd alokacji buforów"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Proszę zrestartować system."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Kontrola obrazu"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Przechwytywanie:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Kontrola profili"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "Domyślne"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Stop Auto"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Przechwycenie obrazu"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Stop Video"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Przechwicenie Wideo"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -201,257 +201,258 @@
 "\n"
 "Nie można utworzyć wątku wideo"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr "Proszę zgłosić na http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "Kontrolki użytkownika"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Jasność:"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Barwa:"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Nasycenie"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Ostrość"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Kompensacja oświetlenia tła"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "Częstotliwość lini zasilania"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "Barwa: Automatycznie"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Ostrość, Auto"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Tryb ręczny"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Tryb automatyczny"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Priorytet migwaki"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "Priorytet przysłony"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Poziom czerni"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Automatyczny balans bieli"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "Balans bieli"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Balans czerwieni"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Balans niebieskiego"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Ekspozycja"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "Automatyczna ziarnistość"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Wzmocnienie"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Odbicie poziome"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Odbicie pionowe"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "Wyśrodkowanie poziome"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "Wyśrodkowanie pionowe"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr "Automatyczna kontrola kluczowania"
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr "Usunięcie koloru"
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Efekty kolorów"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "Kontrola kamery"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Automatyczna ekspozycja"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "Absolutny czas ekspozycji"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr "dynamiczna ilośc klatek/s ekspozycji"
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr "Względne Pan"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr "Przechylenie względne"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr "Reset Pan"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr "Reset nachylenia"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr "Absolutny Pan"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "Ostrośc absolutna"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "Ostrość względna"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Automatyczna ostrość"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr "Absolutny zoom"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr "Względny zoom"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr "Zoom ciągły"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "Prywatność"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Auto ekspozycja"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Auto priorytet ekspozycji"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Ekspozycja (absolutna)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Automatyczny balans bieli temperatury"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Temperatura balansu bieli"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Automatyczny komponent balansu bieli"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "Komponent balansu bieli - niebieskiego"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "Komponent balansu bieli - czerwonego"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Ostrość"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr "Ostrość (absolutna)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Zapisz Plik"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "Plik nr:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr "wartości kodeków"
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
@@ -459,537 +460,558 @@
 "                              enkoder fps:   \n"
 " (0 - użycie wartości fps combobox)"
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "bit rate:   "
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr "qmaks:   "
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr "qmin:   "
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr "max. qdiff:   "
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr "rozmiar dia:   "
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr "rozmiar pre dia:   "
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr "pre me:   "
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr "pre cmp:   "
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr "cmp:   "
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr "sub cmp:   "
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr "rozmiar gop:   "
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr "qblur:   "
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr "subq:   "
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr "max klatek B:   "
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Wideo i pliki"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Urządzenie:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Klatki na sekundę:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Pokaz"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Rozdzielczość:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr ""
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Jakość:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Plik obrazu:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "Plik,Auto"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Format obrazu"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "Plik Wideo:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Kodek wideo:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "właściwości"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Format wideo:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Filtry wideo ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr ""
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Odwrócenie"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Negatyw"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Mono"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr ""
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr ""
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr "wartości kodeka audio"
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Audio"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Dźwięk"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "Audio API:"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "PORTAUDIO"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Urządzenie wejścia:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Urzadzenie domyślne"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "Próbkowanie audio:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Kanały:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Format audio:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Efekty audio ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Echo"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr ""
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr ""
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr ""
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr ""
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Lewy"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Prawy"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Dół"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Góra"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "Stop Auto"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
+#, fuzzy
 msgid "Pan (relative)"
-msgstr ""
+msgstr "Względne Pan"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
+#, fuzzy
 msgid "Tilt (relative)"
-msgstr ""
+msgstr "Przechylenie względne"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
+#, fuzzy
 msgid "Pan Reset"
-msgstr ""
+msgstr "Reset Pan"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
+#, fuzzy
 msgid "Tilt Reset"
-msgstr ""
+msgstr "Reset nachylenia"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
+#, fuzzy
 msgid "Pan/tilt Reset"
-msgstr ""
+msgstr "Reset Pan"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
+#, fuzzy
 msgid "Focus (absolute)"
-msgstr ""
+msgstr "Ostrość (absolutna)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
+#, fuzzy
 msgid "LED1 Frequency"
-msgstr ""
+msgstr "Częstotliwość lini zasilania"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr ""
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr ""
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr ""
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr ""
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG video 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - flash video 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - win. med. video 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - MPG2 format"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MS MP4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr "MPEG4-ASP"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr "MPEG4-AVC (H264)"
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr ""
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Wyświetlanie informacji debugowania"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr ""
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr ""
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr ""
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr ""
 
-#: src/options.c:764
+#: ../src/options.c:772
+#, fuzzy
 msgid "Image File name"
-msgstr ""
+msgstr "Plik obrazu:"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr ""
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr ""
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr ""
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr ""
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr ""
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr ""
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr ""
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr ""
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr ""
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr ""
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr ""
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr ""
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr ""
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr ""
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr ""
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
 msgstr ""
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr ""
+
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""

guvcview-src-1.5.3.tar.gz/po/pt.po -> guvcview-src-1.6.1.tar.gz/po/pt.po Changed

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_PT\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2011-10-17 22:25+0100\n"
 "Last-Translator: Paulo Assis <pj.assis@gmail.com>\n"
 "Language-Team: Portuguese\n"
@@ -19,16 +19,16 @@
 "X-Launchpad-Export-Date: 2009-11-15 23:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Guvcview Captura de Video"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "GUVCViewer Controlos"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -38,7 +38,7 @@
 "\n"
 "Não foi possivel conectar a camera"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -47,7 +47,7 @@
 "e se o driver da camera se encontra instalado."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -57,12 +57,12 @@
 "\n"
 "Controlos UVC dinâmicos"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "Os controlos dinâmicos foram adicionados ao driver UVC"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -72,7 +72,7 @@
 "\n"
 "Controlos UVC dinâmicos"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -82,8 +82,7 @@
 "dinâmicos ao driver UVC\n"
 "Verifique se lançou guvcview como root (ou sudo)."
 
-#: src/guvcview.c:387
-#: src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -93,8 +92,7 @@
 "\n"
 "Não foi possível iniciar um formato video válido"
 
-#: src/guvcview.c:388
-#: src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -102,8 +100,7 @@
 "Verfique se a sua camera é compativel com v4l2\n"
 "e se este se encontra devidamente instalado."
 
-#: src/guvcview.c:410
-#: src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -113,12 +110,11 @@
 "\n"
 "Não foi possivel iniciar com as definições minimas"
 
-#: src/guvcview.c:411
-#: src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Por favor remova e volte a conectar a camera."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -128,11 +124,11 @@
 "\n"
 "Não foi possível  verificar propriedades do dispositivo de vídeo"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Por favor verifique se o driver suporta v4l2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -142,11 +138,11 @@
 "\n"
 "Erro do metodo Read"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "Por favor experimente mmap (--capture_method=1)"
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -156,53 +152,48 @@
 "\n"
 "Não foi possivel alocar Buffers"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Por favor experimente reiniciar o sistema."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Controlos de imagem"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Captura:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Perfis de Controlo:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "Defeito"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Parar Auto:"
 
-#: src/guvcview.c:569
-#: src/callbacks.c:1118
-#: src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Cap. Imagem"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574
-#: src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Parar Video"
 
-#: src/guvcview.c:579
-#: src/guvcview.c:795
-#: src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Cap. Video"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -212,268 +203,258 @@
 "\n"
 "Não foi possivel criar o Thread de Video"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr "Por favor reporte em http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "Controlos de Utilizador"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Brilho"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Tonalidade"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Saturação"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Enfatização"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Compensação de Luz"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "Frequência da Rede"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "Tonalidade, Automático"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Focagem, Auto"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Modo manual"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Modo automático"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Modo prioridade do obturador"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "Modo prioridade da abertura"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Nível do Preto"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Balanço de Brancos, Automático"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "Faz Balanço de Brancos"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Balanço de Vermelho"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Balanço de Azul"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Exposição"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "Ganho, Automático"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Ganho"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Rotação Horizontal"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Rotação Vertical"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "Eixo Horizontal"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "Eixo Vertical"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Efeitos de Cor"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "Controlos de Camera"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Exposição Automática"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "Tempo de Exposição, Absoluto"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr "Exposição, Taxa de Frames Dinâmica"
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr "Rotação, relativa"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr "Inclinação, Relativa"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr "Rotação, Restaurar"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr "Inclinação, Restaurar"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr "Rotação, Absoluta"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "Foco, Absoluto"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "Foco, Relativo"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Foco, Automático"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr "Zoom, Absoluto"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr "Zoom, Relativo"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr "Zoom, Continuo"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Exposição, Auto"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Exposição, Prioridade Auto"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Exposição (Absoluta)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Balanço de Brancos, Auto"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Branco (Temp. de côr)"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Componente de cor, Auto"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "Componente Azul"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "Componente Vermelho"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Foco"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr "Foco (Absoluto)"
 
-#: src/video_tab.c:41
-#: src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Gravar Ficheiro"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76
-#: src/video_tab.c:106
-#: src/globals.c:73
-#: src/globals.c:76
-#: src/options.c:326
-#: src/options.c:445
-#: src/options.c:502
-#: src/callbacks.c:608
-#: src/callbacks.c:890
-#: src/callbacks.c:1039
-#: src/callbacks.c:1056
-#: src/callbacks.c:1092
-#: src/callbacks.c:1207
-#: src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "Ficheiro num:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr "Valores do Codec"
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
@@ -481,504 +462,504 @@
 "                              fps do codec:   \n"
 " (0 - use o valor da combobox)"
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr "pts monotonico"
 
 #. bit rate
-#: src/video_tab.c:160
-#: src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "rácio de bits"
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Video e Ficheiros"
 
 #. Devices
-#: src/video_tab.c:571
-#: src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Dispositivo de video:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Taxa de imagens:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Mostrar"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Resolução:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Saída de Câmera:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Ficheiro de Imagem:"
 
-#: src/video_tab.c:804
-#: src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "Ficheiro,Auto"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Formato de Imagem:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr "Imagem por Defeito"
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "Ficheiro de Video:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Codec de Video:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939
-#: src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "propriedades"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Formato de Video:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr "Vídeo por Defeito"
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Filtros de Video ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Espelho"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Invertido"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Negativo"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Cinza"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr " Pedaços"
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr " Particulas"
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr "Valores do Codec"
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Audio"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Som"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr "Mostrar volume"
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "API de Audio:"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "PORTAUDIO"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202
-#: src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Dispositivo de som:"
 
-#: src/audio_tab.c:236
-#: src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Automático"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "Frequência:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Canais:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Formato Audio:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Efeitos de Audio ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Eco"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr " Ruido"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Reverb"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " WhaWah"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr " Patinho"
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Direita"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Descer"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Subir"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr "Desligado"
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr "Ligado"
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr "Intermitente"
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 msgid "Auto"
 msgstr "Auto"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr "Rotação (relativa)"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr "Inclinação (relativa)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
 msgid "Pan Reset"
 msgstr "Rotação (restaurar)"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
 msgid "Tilt Reset"
 msgstr "Inclinação (restaurar)"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "Rot./Incl. (restaurar)"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr "Focagem (absoluta)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "Modo LED1"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "Frequência LED1"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "Parar proc. video (Raw)"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Bits por pixel (Raw)"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - c/comp."
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - s/comp YUV"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - s/comp BMP"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG video 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - flash video 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - wind. med. video 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - Mpeg video 2"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MP4 - MS Mpeg 4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr "MPEG4-ASP (divx5)"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr "MPEG4-AVC (H264)"
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "Mostra versão"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Apresenta Informação para Depuração"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Dispositivo de vídeo defeito: /dev/video0"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
-msgstr "Sair após adicionar controlos dinâmicos ao driver UVC (necessita root/sudo)"
+msgstr ""
+"Sair após adicionar controlos dinâmicos ao driver UVC (necessita root/sudo)"
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr "Desabilitar o streaming de vídeo (apenas controlos)"
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr "Não mostrar GUI"
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr "Método de Captura (1-mmap (padrão) 2 -read)"
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "Ficheiro de configuração"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "Aceleração vídeo por hardware (sim(1) | não(0))"
 
-#: src/options.c:762
-msgid "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
-msgstr "Formato entrada(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+#: ../src/options.c:770
+msgid ""
+"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+msgstr ""
+"Formato entrada(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Resolução, defeito: 640x480"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Ficheiro de Imagem:"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "Intervalo de captura de imagens em segundos"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Numero de imagens a capturar"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "Ficheiro de vídeo (captura no arranque)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "Tempo de captura vídeo (em segundos)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr "Termina guvcview depois de completar video"
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr "Numero Inicial de Frames a Ignorar"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "Apresentar FPS (sim(1) | não(0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Carrega perfil no arranque"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- opções locais"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Focagem continua"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "Focar"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr "Erro"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
@@ -988,23 +969,23 @@
 "Foram detectados múltiplos dispositivos de vídeo.\n"
 "Quer tentar outro ?\n"
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "começar novo"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "Reiniciar"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "novo"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "cancelar"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -1012,18 +993,30 @@
 "lançar novo processo ou reiniciar?\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Abrir Ficheiro"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr "Alerta do Guvcview:"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "Espaço livre em disco insuficiente"
 
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr "Visualize e capture imagens da sua webcam em linux"
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
+
 #~ msgid "PCM"
 #~ msgstr "PCM"

guvcview-src-1.5.3.tar.gz/po/pt_BR.po -> guvcview-src-1.6.1.tar.gz/po/pt_BR.po Changed

@@ -7,29 +7,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2012-01-18 14:02+0000\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
 "X-Generator: Launchpad (build 14868)\n"
 "X-Project-Style: default\n"
-"Language: pt\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Capturador de vídeo Guvcview"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "Controles do GUVCViewer"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -39,7 +39,7 @@
 "\n"
 "Não foi possível conectar a câmera"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -48,7 +48,7 @@
 "e se o driver correto está instalado."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -58,12 +58,12 @@
 "\n"
 "Extensão de controles UVC"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "As extensões de controles foram adicionadas ao driver UVC"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -73,7 +73,7 @@
 "\n"
 "Extensões de controles UVC"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -83,7 +83,7 @@
 "controles ao driver UVC\n"
 "Verifique se iniciou o guvcview como root (ou sudo)."
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -93,7 +93,7 @@
 "\n"
 "Não foi possível definir um fluxo de vídeo para o guvcview"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -101,7 +101,7 @@
 "Verifique se o driver é compatível com v4l2\n"
 "e se este se está instalado corretamente."
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -111,11 +111,11 @@
 "\n"
 "Não foi possível iniciar com as definições mínimas"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Por favor, reconecte sua câmera."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -125,11 +125,11 @@
 "\n"
 "Não foi possível consultar as propriedades do dispositivo"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Por favor, verifique se o driver oferece suporte v4l2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -139,11 +139,11 @@
 "\n"
 "Erro do método de leitura"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "Por favor, tente o mmap no lugar (--capture_method=1)"
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -153,48 +153,48 @@
 "\n"
 "Não foi possível alocar Buffers"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Por favor, tente reiniciar o sistema."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Controles de imagem"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Captura:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Perfis de controles:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "Padrões"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Parar auto:"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Cap. imagem"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Parar vídeo"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Cap. vídeo"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -204,258 +204,258 @@
 "\n"
 "Não foi possível criar o thread de vídeo"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
-msgstr ""
-"Por favor, reporte em http://developer.berlios.de/bugs/?group_id=8179"
+msgstr "Por favor, reporte em http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "Controles do usuário"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Brilho"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Matiz"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Saturação"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Nitidez"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Gama"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Compensação de Luz"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "Frequência da linha de transmissão"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "Matiz, Automático"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Focagem, auto"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Modo manual"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Modo automático"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Modo prioridade do obturador"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "Modo prioridade da abertura"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Níveis de preto"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Balanço de brancos"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "Fazer balanço de brancos"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Balanço do vermelho"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Balanço do azul"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Exposição"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "Ganho, automático"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Ganho"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Virar horizontalmente"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Virar verticalmente"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "Eixo horizontal"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "Eixo vertical"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr "AGC de Chroma"
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr "Removedor de cores"
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Efeitos de cor"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "Controles de câmera"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Exposição automática"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "Tempo de exposição, absoluto"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr "Exposição, taxa de quadros dinâmicos"
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr "Deslocamento, relativo"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr "Inclinação, relativo"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr "Deslocamento, restaurar"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr "Inclinação, restaurar"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr "Deslocamento, absoluto"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "Foco, absoluto"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "Foco, relativo"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Foco, automático"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr "Zoom, absoluto"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr "Zoom, relativo"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr "Zoom, contínuo"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Exposição, auto"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Exposição, prioridade auto"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Exposição (absoluta)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Balanço de branco, auto"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Balanço de branco temperatura"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Componente de cor, auto"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "Balanço de branco componente azul"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "Balando de branco componente vermelho"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Foco"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr "Foco (absoluto)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Salvar arquivo"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "Arquivo num:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr "valores do codec"
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
@@ -463,504 +463,503 @@
 "                              codificador fps:   \n"
 " (0 - use o valor fps da caixa de marcação)"
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr " pts monotonico"
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "taxa de bits:   "
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr "qmax:   "
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr "qmin:   "
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr "qdiff max:   "
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr "tamanho do dia:   "
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr "tamanho do diâ pré:   "
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr "pre me:   "
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr "pre cmp:   "
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr "cmp:   "
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr "sub cmp:   "
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr "última contagem preditor:   "
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr "tamanho do gop:   "
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr "qcompress:   "
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr "qblur:   "
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr "subq:   "
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr "framerefs:   "
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr "método me:   "
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr "decisão mb:   "
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr "Max quadros B:   "
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr "num threads:   "
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Vídeo & arquivos"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Dispositivo:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Taxa de quadros:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Mostrar"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Resolução:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Saída de câmera:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Arquivo de imagem:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "Arquivo,Auto"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Formato de imagem:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr "Imagem por Defeito"
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "Arquivo de vídeo:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Codec de vídeo:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "propriedades"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Formato de vídeo:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr "Vídeo por Defeito"
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Filtros de vídeo ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Espelho"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Invertido"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Negativo"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Cinza"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr " Pedaços"
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr " Partículas"
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr "valores do codec de áudio"
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Som"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr " Mostrar Volume"
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "API de áudio:"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "PORTAUDIO"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Dispositivo de entrada:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Padrão"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "Taxa de amostragem:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Canais:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Formato de áudio:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Efeitos de áudio ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Eco"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr " Ruído"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Reverb"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " WahWah"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr " Patinho"
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Direita"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Baixo"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Cima"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr "Desligado"
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr "Ligado"
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr "Intermitente"
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 msgid "Auto"
 msgstr "Auto"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr "8 bit"
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr "12 bit"
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr "Deslocamento (relativo)"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr "Inclinação (relativo)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
 msgid "Pan Reset"
 msgstr "Restaurar deslocamento"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
 msgid "Tilt Reset"
 msgstr "Restaurar inclinação"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "Restaurar Des./Incl."
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr "Foco (absoluto)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "Modo LED1"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "Frequência LED1"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "Parar processamento de vídeo"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Bits brutos por pixel"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - com compressão"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - sem compressão YUV"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - Sem compressão BMP"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "Vídeo MPEG 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - vídeo flash 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - win. med. video 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - MPEG vídeo 2"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MS MP4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr "MPEG4-ASP"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr "MPEG4-AVC (H264)"
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "Exibe a versão"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Mostra informação de depuração"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Dispositivo de vídeo para usar padrão: /dev/video0"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr "Sair após adicionar extensão de controles UVC (precisa de root/sudo)"
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr "Desabilitar o fluxo de vídeo (apenas controles de imagens)"
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr "Não mostrar GUI"
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr "Método de captura (1-mmap (padrão) 2-leitura)"
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "Arquivo de configuração"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "Aceleração de hardware (habilitado(1) | desabilitado(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
-"Pixel "
-"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
-"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
-"Formato de "
-"pixel(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|y"
-"16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+"Formato de pixel(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Tamanho do quadro, padrão: 640x480"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Nome do arquivo de imagem"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "Intervalo de captura de imagens em segundos"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Numero de imagens a capturar"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "Arquivo de vídeo (captura ao iniciar)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "Tempo de captura de vídeo (em segundos)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr "Termina o guvcview depois de fechar o vídeo"
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr "Numero inicial de quadros a ignorar"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "Apresentar o valor FPS (habilitado(1) | desabilitado(0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Carrega perfil ao iniciar"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- opções locais"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Focagem automática (contínua)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "Definir foco"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr "Erro"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
@@ -970,23 +969,23 @@
 "Foram detectados múltiplos dispositivos de vídeo.\n"
 "Quer tentar outro?\n"
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "iniciar novo"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "reiniciar"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "novo"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "cancelar"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -994,14 +993,26 @@
 "lançar novo processo ou recomeçar?.\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Abrir arquivo"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr "Alerta Guvcview:"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "Sem espaço livre suficiente no disco"
+
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""

guvcview-src-1.5.3.tar.gz/po/ru.po -> guvcview-src-1.6.1.tar.gz/po/ru.po Changed

@@ -5,28 +5,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2012-02-24 06:49+0000\n"
 "Last-Translator: Auduf <5097@mail.ru>\n"
 "Language-Team: Russian <>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
 "X-Generator: Launchpad (build 14868)\n"
-"Language: ru\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Заxват видео через Guvcview"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "Панель управления программы GUVCViewer"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -36,7 +36,7 @@
 "\n"
 "Не удалось открыть устройство"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -45,7 +45,7 @@
 "и драйвер установлен корректно."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -54,12 +54,12 @@
 "Guvcview:\n"
 "Управление UVC расширениями"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "Управления расширениями был длбавлен к драйверу UVC"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -68,7 +68,7 @@
 "Ошибка Guvcview:\n"
 "Управление UVC расширениями"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -78,7 +78,7 @@
 "управлений к расширению UVC драйвера.\n"
 "Убедитесь, что вы запустили guvcview как root (или sudo)"
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -87,7 +87,7 @@
 "Ошибка Guvcview:\n"
 "Правильный видео поток не может быть установлен для guvcview"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -95,7 +95,7 @@
 "Убедитесь что драйвер совместим с v4l2\n"
 "и правильно установлен"
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -105,11 +105,11 @@
 "\n"
 "Не удался запуск с минимальной начальной установкой"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Пожалуйста, переподключите камеру."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -118,11 +118,11 @@
 "Ошибка Guvcview:\n"
 "Не могу получить свойства устройства"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Убедитесь в том, что драйвер устройства поддерживает v4l2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -132,11 +132,11 @@
 "\n"
 "Ошибка метода чтения"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "Попробуйте лучше mmap (--capture_method=1)."
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -146,48 +146,48 @@
 "\n"
 "Не удалось выделить место для буферов"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Следует попробовать перезапустить систему."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Регулировка изображения"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Захват:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Профиль регулировки:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "Заводские установки"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr ""
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Сделать снимок"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Стоп"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Видео"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -197,259 +197,266 @@
 "\n"
 "Не удалось создать поток команд для видео"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
-"Следует сообщить об этом сюда: "
-"http://developer.berlios.de/bugs/?group_id=8179"
+"Следует сообщить об этом сюда: http://developer.berlios.de/bugs/?"
+"group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "Настройки пользователя"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Яркость"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Контрастность"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Оттенок"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Насыщенность"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Резкость"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Гамма"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Компенсация ярких участков"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "Частота в электросети"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "Оттенок, Автоматически"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Фокус, авто"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Ручной режим"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Авторежим"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Режим приоритета затвора"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "Режим приоритета диафрагмы"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Уровень чёрного"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Баланс белого, Автоматически"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
+#, fuzzy
 msgid "Do White Balance"
-msgstr ""
+msgstr "Баланс красного"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Баланс красного"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Баланс синего"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Экспозиция"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "Усиление, автоматически"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Усиление"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Отразить по горизонтали"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Отразить по вертикали"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "Горизонтальный центр"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "Вертикальный центр"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Цветовые эффекты"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "Настройки камеры"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Авто выдержка"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "Время выдержки, Абсолютное"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr "Выдержка, Динамичная частота кадров"
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
+#, fuzzy
 msgid "Pan, Relative"
-msgstr ""
+msgstr "Гор. поворот (относит.)"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
+#, fuzzy
 msgid "Tilt, Relative"
-msgstr ""
+msgstr "Верт. поворот (относит.)"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
+#, fuzzy
 msgid "Pan, Reset"
-msgstr ""
+msgstr "Гор. возврат"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
+#, fuzzy
 msgid "Tilt, Reset"
-msgstr ""
+msgstr "Верт. возврат"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
+#, fuzzy
 msgid "Pan, Absolute"
-msgstr ""
+msgstr "Увеличение, Совершенное"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "Фокус, Совершенный"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "Фокус, Относительный"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Фокус, Автоматический"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr "Увеличение, Совершенное"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr "Увеличение, Относительное"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr "Увеличение, Постоянное"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "Конфиденциальность"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Экспозиция, авто"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Режим частоты кадров"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Выдержка (совершенная)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Температура баланса белого, авто"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Температура баланса белого"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Компонент баланса белого, авто"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "Синий компонент баланса белого"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "Красный компонент баланса белого"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Фокусирование"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr "Фокусирование (Абсолютное)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Сохранить файл"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "№ п/п:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr "Параметры кодека"
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
@@ -457,504 +464,507 @@
 "                              кодек кадров/с.:   \n"
 " (0 - использовать значение списка)"
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "Битрейт:   "
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr "qmax:   "
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr "qmin:   "
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr "макс. qdiff:   "
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr "dia-size:   "
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr "pre-dia-size:   "
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr "pre-me:   "
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr "pre-cmp:   "
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr "cmp:   "
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr "sub-cmp:   "
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr "last-predictor-count:   "
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr "gop-size:   "
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr "qcompress:   "
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr "qblur:   "
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr "me-method:   "
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr "mb-decision:   "
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Видео и файлы"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Устройство:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Частота кадров:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Показать"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Разрешение:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Вывод камеры:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Применить"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Качество:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Файл снимка:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "автомат."
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Формат снимка:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "Файл видео:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Видео-кодек:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "Свойства"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Формат видео:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Видео-фильтры ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Гор. отражение"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Верт. отражение"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Негатив"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Чёрно-белое"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr " Мозаика"
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr ""
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Звук"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "Аудио-API:"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "PORTAUDIO"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Устройство ввода:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "по умолчанию"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "Частота дискретизации:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - моно"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - стерео"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Каналов:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Формат аудио:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Аудио-эффекты ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Эхо"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr " Фуз"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Реверберация"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " Квакушка"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr " Утёнок"
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Влево"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Вправо"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Вниз"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Вверх"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr "Откл."
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr "Вкл."
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr "Мерцание"
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 msgid "Auto"
 msgstr "Авто"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr "8 бит"
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr "12 бит"
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
+#, fuzzy
 msgid "Pan (relative)"
 msgstr "Гор. поворот (относит.)"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
+#, fuzzy
 msgid "Tilt (relative)"
 msgstr "Верт. поворот (относит.)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
+#, fuzzy
 msgid "Pan Reset"
 msgstr "Гор. возврат"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
+#, fuzzy
 msgid "Tilt Reset"
 msgstr "Верт. возврат"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "Гор./верт. возврат"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr "Фокус (абсолютный)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "Режим светодиода1"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "Частота светодиода1"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "Отключение обработки видео"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Кол-во бит на пиксел"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - сжатый"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - несжатый YUV"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - несжатый BMP"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG-видео 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - флэш-видео 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - видео Windows Media 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - формат MPG2"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MS MP4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr "MPEG4-ASP"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr "MPEG4-AVC (H264)"
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "Показывает версию"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Показывает информацию для отладки"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Используемое видео-устройство (по умолчанию /dev/video0)"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr "Не отображать графический интерфейс"
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "Конфигурационный файл"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "Аппаратное ускорение (вкл.(1) | выкл.(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
-"Pixel "
-"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
-"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
-"Формат "
-"пикселя(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey"
-"|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+"Формат пикселя(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Размер кадра (по умолчанию 640х480)"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Имя файла изображения"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "Интервал между снимками (сек)"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Количество снимков"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "Имя видео-файла (запись сразу после запуска)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "Продолжительность видео-записи (сек)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr "Количество начальных кадров для пропуска"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "Отображение частоты кадров (вкл.(1) | выкл.(0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Загрузка профиля при запуске"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- локальные параметры"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Автофокусировка (непрерывная)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "Установка фокуса"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
@@ -964,23 +974,23 @@
 "У вас установлен дополнительный видео прибор.\n"
 "Хотите попробовать другой?\n"
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "Запуск нового"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "перезагрузить"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "Новый"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "Отмена"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -988,14 +998,26 @@
 "Запустить новый процесс или перезапустить?\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Загрузка файла"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "Недостаточно свободного места на диске"
+
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""

guvcview-src-1.5.3.tar.gz/po/sr.po -> guvcview-src-1.6.1.tar.gz/po/sr.po Changed

@@ -6,28 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2011-10-31 21:01+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Launchpad Serbian Translators\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2012-02-27 23:28+0000\n"
 "X-Generator: Launchpad (build 14868)\n"
-"Language: sr\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Камерица — видео снимање"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "Контроле Камерице"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -37,7 +37,7 @@
 "\n"
 "Не могу да отворим уређај"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -46,7 +46,7 @@
 "је инсталиран исправан управљачки програм."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -56,12 +56,12 @@
 "\n"
 "Контроле УВЦ проширења"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "Контроле проширења су додате УВЦ управљачком програму"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -71,7 +71,7 @@
 "\n"
 "Контроле УВЦ проширења"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -81,7 +81,7 @@
 "проширења УВЦ управљачком програму. Уверите се да\n"
 "сте покренули камерче као администратор (или судо)."
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -91,7 +91,7 @@
 "\n"
 "Не могу да подесим исправан видео ток за камерче"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -99,7 +99,7 @@
 "Уверите се да је управљачки програм вашег уређаја\n"
 "усаглашен са в4л2 и да је исправно инсталиран."
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -109,11 +109,11 @@
 "\n"
 "Не могу да започнем са минималним подешавањима"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Молим поново повежите вашу камеру."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -123,11 +123,11 @@
 "\n"
 "Не могу да испитам могућности уређаја"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Уверите се да управљачки програм уређаја подржава в4л2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -137,11 +137,11 @@
 "\n"
 "Грешка режима читања"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "Молим покушајте „mmap“ уместо овог (--capture_method=1)."
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -151,48 +151,48 @@
 "\n"
 "Не могу да доделим Бафере"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Молим покушајте поново да покренете систем."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "Контроле слике"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Снимање:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Профили контрола:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "Основно"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Заустави аутоматско"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Сними слику"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Заустави видео"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Сними видео"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -202,258 +202,259 @@
 "\n"
 "Не могу да направим видео нит"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 "Молим пријавите на адресу: http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "Контроле корисника"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Осветљеност"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Контраст"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Нијанса"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Засићеност"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Оштрина"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Гама"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Поправка светла позадине"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "Учесталост освежавања"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "Нијанса, аутоматски"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Фокус, ауто"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Ручно"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Аутоматски"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Приоритет затварача"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "Приоритет бленде"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Ниво црне"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Равнотежа белог, аутоматски"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "Уравнотежавање белог"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Равнотежа црвеног"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Равнотежа плавог"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Излагање"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "Појачање, аутоматски"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Појачање"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Водоравно превртање"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Усправно превртање"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "Водоравно центрирање"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "Усправно центрирање"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr "АГЦ хроминансе"
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr "Укидач боје"
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Ефекти боје"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "Контроле камере"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Аутоматска експозиција"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "Време излагања, апсолутно"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr "Излагање, динамички проток кадра"
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr "Праћење, релативно"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr "Нагибање, релативно"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr "Праћење, поновно"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr "Нагибање, поновно"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr "Праћење, апсолутно"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "Фокус, апсолутни"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "Фокус, релативни"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Фокус, аутоматски"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr "Зум, апсолутни"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr "Зум, релативни"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr "Зум, непрекидни"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "Приватност"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Излагање, аутоматско"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Излагање, приоритет аутоматског"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Излагање (апсолутно)"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Температура равнотеже белог, ауто"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Температура равнотеже белог"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Састојак равнотеже белог, ауто"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "Плави састојак равнотеже белог"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "Црвени састојак равнотеже белог"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Фокус"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr "Фокус (апсолутни)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Сачувајте датотеку"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "Дат. бр.:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr "вредности кодека"
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
@@ -461,504 +462,503 @@
 "                              ф/с енкодера:   \n"
 " (0 — користите вредност ф/с поља за бирање)"
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr " једнообразне тачке"
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "проток бита:   "
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr "qmax:   "
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr "qmin:   "
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr "max. q разл:   "
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr "диа величина:   "
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr "пре диа величина:   "
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr "пре ме:   "
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr "пре цмп:   "
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr "цмп:   "
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr "под цмп:   "
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr "последњи број предсказивача:   "
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr "гоп величина:   "
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr "q-сажимање:   "
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr "q-замућење:   "
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr "под-q:   "
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr "framerefs:   "
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr "ме начин:   "
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr "мб одлука:   "
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr "највише Б оквира:   "
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr "бр. нити:   "
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Видео и датотеке"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Уређај:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Проток кадра:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Прикажи"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Резолуција:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Излаз камере:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Примени"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Квалитет:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Датотека слике:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "Датотека, самостално"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Формат слике:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr "Сними слику по основи"
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "Датотека видеа:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Видео кодек:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "својства"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Формат снимка:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr "Сними видео по основи"
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "———— Видео филтери ————"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Огледало"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Обрнуто"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Негатив"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Моно"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr " Комадићи"
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr " Честице"
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr "вредност кодека звука"
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Звук"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr " Прикажи ВУ метар"
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "Аудио АПИ:"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "ПОРТАУДИО"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "ПУЛСЕАУДИО"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Улазни уређај:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Основни са уређаја"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "Проток узорка:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 — моно"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 — стерео"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Број канала:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Формат звука:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "———— Аудио ефекти ————"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Ехо"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr " Маљ"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Одјек"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " ВауВау"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr " Паче"
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Лево"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Десно"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Доле"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Горе"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr "Искљ."
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr "Укљ."
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr "Треперење"
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 msgid "Auto"
 msgstr "Самостално"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr "8 бита"
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr "12 бита"
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr "Праћење (релативно)"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr "Нагибање (релативно)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
 msgid "Pan Reset"
 msgstr "Поновно праћење"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
 msgid "Tilt Reset"
 msgstr "Поновно нагибање"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "Поновно праћење/нагибање"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr "Фокус (апсолутни)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "ЛЕД1 режим"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "ЛЕД1 учесталост"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "Онемогући обрађивање видеа"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Сирових бита по тачци"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "МЈПГ — сажети"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "ЈУЈ2 — несажети ЈУВ"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "РГБ — несажети БМП"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "МПЕГ видео 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "ФЛВ1 — флеш видео 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "ВМВ1 — виндоуз медија видео 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "МПГ2 — МПГ2 формат"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "МС МП4 В3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr "МПЕГ4-АСП"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr "МПЕГ4-АВЦ (Х264)"
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "Штампа издање"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Приказује информацијe о исправљању грешака"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Видео уређај за коришћење основни: „/dev/video0“"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr "Излази после додавања контрола УВЦ проширења (захтева „root/sudo“)"
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr "Не пушта ток видеа (само контроле слике)"
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr "Не приказује ГКС"
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr "Начин снимања (1-ммап (основно) 2-читај)"
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "Датотека подешавања"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "Убрзање физичке компоненте (укључи(1) | искључи(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
-"Pixel "
-"format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|"
-"y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+"Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
-"Формат тачака "
-"(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|y16 "
-"|s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
+"Формат тачака (mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
+"y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Величина кадра, основна: 640к480"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Име датотеке слике"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "Интервал снимања слике у секундама"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Број слика за снимање"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "Име датотеке видеа (снимање од почетка)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "Време снимања видеа (у секундама)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr "Излази из камерице након затварања видеа"
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr "Број почетних кадрова за прескакање"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "Приказује ФПС вредност (укључи (1) | искључи (0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Учитава профил приликом покретања"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "— локална опција"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Самостално фокусирање (непрекидно)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "подеси фокус"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr "Грешка"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
@@ -968,23 +968,23 @@
 "Имате инсталираних неколико видео уређаја.\n"
 "Желите ли да пробате неки други\n"
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "покрени нови"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "поново покрени"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "нови"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "откажи"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -992,14 +992,26 @@
 "да покренем нови процес или да се поново покренем?.\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Учитајте датотеку"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr "Упозорење Камерице:"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "Нема довољно слободног простора на диску"
+
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""

guvcview-src-1.5.3.tar.gz/po/tr.po -> guvcview-src-1.6.1.tar.gz/po/tr.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2009-09-15 02:22+0000\n"
 "Last-Translator: Paulo Assis <pj.assis@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -18,946 +18,961 @@
 "X-Launchpad-Export-Date: 2009-11-15 23:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr ""
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr ""
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to open device"
 msgstr ""
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
 msgstr ""
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr ""
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
 "UVC Extension controls"
 msgstr ""
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
 "Make sure you run guvcview as root (or sudo)."
 msgstr ""
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Can't set a valid video stream for guvcview"
 msgstr ""
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
 msgstr ""
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to start with minimum setup"
 msgstr ""
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Lütfen  kameranı tekrar bağla."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Couldn't query device capabilities"
 msgstr ""
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr ""
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Read method error"
 msgstr ""
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr ""
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to allocate Buffers"
 msgstr ""
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Lütfen  sistemi tekrar başlatmayı dene."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr ""
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr ""
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr ""
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr ""
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr ""
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr ""
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr ""
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr ""
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
 "Unable to create Video Thread"
 msgstr ""
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr ""
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Parlaklık"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Karşıtlık"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr ""
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr ""
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Keskinlik"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Kontras derecesi (gama)"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr ""
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr ""
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr ""
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr ""
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr ""
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr ""
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr ""
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr ""
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr ""
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr ""
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr ""
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr ""
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr ""
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr ""
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr ""
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr ""
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr ""
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr ""
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr ""
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr ""
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr ""
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr ""
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr ""
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr ""
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr ""
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr ""
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr ""
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr ""
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr ""
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr ""
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr ""
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Dosyayı Kaydet"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr ""
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr ""
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 msgstr ""
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr ""
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr ""
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr ""
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr ""
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr ""
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr ""
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr ""
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr ""
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr ""
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr ""
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr ""
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr ""
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr ""
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr ""
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr ""
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr ""
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr ""
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr ""
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr ""
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 msgid "num threads:   "
 msgstr ""
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Video & Dosyalar"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr ""
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr ""
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Göster"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr ""
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr ""
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr ""
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr ""
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Resim Dosyası:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr ""
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr ""
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr ""
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr ""
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr ""
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Video dosya:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Video Filtreleri----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr ""
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr ""
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr ""
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Mono"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr ""
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr ""
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr ""
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr ""
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr ""
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr ""
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr ""
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr ""
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr ""
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr ""
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Kanallar:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr ""
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr ""
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Göster"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr ""
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr ""
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr ""
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr ""
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr ""
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr ""
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr ""
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr ""
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 msgid "Auto"
 msgstr ""
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
 msgid "Pan Reset"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
 msgid "Tilt Reset"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr ""
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr ""
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr ""
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr ""
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr ""
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr ""
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr ""
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr ""
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr ""
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr ""
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr ""
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr ""
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr ""
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr ""
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr ""
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr ""
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr ""
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr ""
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 msgstr ""
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr ""
 
-#: src/options.c:764
+#: ../src/options.c:772
+#, fuzzy
 msgid "Image File name"
-msgstr ""
+msgstr "Resim Dosyası:"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr ""
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr ""
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr ""
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr ""
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr ""
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr ""
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr ""
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr ""
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr ""
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr ""
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr ""
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr ""
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr ""
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr ""
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr ""
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr ""
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
 msgstr ""
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr ""
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr ""
 
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""
+
 #~ msgid "PCM"
 #~ msgstr "PCM"

guvcview-src-1.5.3.tar.gz/po/uk.po -> guvcview-src-1.6.1.tar.gz/po/uk.po Changed

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2010-11-07 10:28+0000\n"
 "Last-Translator: Taras Romaniv <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,16 +18,16 @@
 "X-Launchpad-Export-Date: 2011-01-19 14:28+0000\n"
 "X-Generator: Launchpad (build 12214)\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Захоплювач відео Guvcview"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "Панель налаштувань Guvcview"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -37,7 +37,7 @@
 "\n"
 "Не можу відкрити пристрій"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -46,7 +46,7 @@
 "і встановлено відповідний драйвер."
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -56,12 +56,12 @@
 "\n"
 "Елементи керування розширенням UVC"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "Керуючі елементи розширення були додані до драйверу UVC"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -71,7 +71,7 @@
 "\n"
 "Керуючі елементи UVC"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -81,7 +81,7 @@
 "елементів розширення до драйверу UVC.\n"
 "Переконайтесь що Guvcview запущено від імені root (чи sudo)."
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -91,7 +91,7 @@
 "\n"
 "Не можу встановити правильний відео потік для Guvcview"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -99,7 +99,7 @@
 "Переконайтесь, що драйвер сумісний з v4l2\n"
 "і встановлений правильно."
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -109,11 +109,11 @@
 "\n"
 "Не можу запуститись з мінімальною установкою"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "Будь ласка, повторно підключіть свою камеру."
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -123,11 +123,11 @@
 "\n"
 "Не можу надіслати запит про можливості пристрою"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "Переконайтесь, що драйвер пристрою підтримує v4l2"
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -137,11 +137,11 @@
 "\n"
 "Помилка методу зчитування."
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "Будь ласка, спробуйте mmap instead (--capture_method=1)."
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -151,50 +151,50 @@
 "\n"
 "Не можу виділити місце під Буфери."
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "Будь ласка, спробуйте перезавантажити систему."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr ""
 "Керування\n"
 "зображенням"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "Захоплення:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "Керування профілями:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "Скинути"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "Зупинити"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "Знімок"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "Зупинити"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "Відео"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -204,7 +204,7 @@
 "\n"
 "Не можу створити потік команд для відео"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr ""
 "Будь ласка, повідомте про це тут http://developer.berlios.de/bugs/?"
@@ -212,251 +212,252 @@
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "Керуючі елементи користувача"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "Яскравість"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "Контраст"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "Відтінок"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "Насиченість"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "Різкість"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "Гамма"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "Компенсація підсвітки"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "Частота електромережі"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "Авто відтінок"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "Авто фокус"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "Ручний режим"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "Авторежим"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "Пріоритет затвору"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "Пріоритет діафрагми"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "Рівень чорного"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "Авто баланс білого"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "Збалансувати білий"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "Баланс червоного"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "Баланс синього"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "Експозиція"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "Авто посилення"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "Посилення"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "Горизонтальне віддзеркалення"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "Вертикальне віддзеркалення"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "Горизонтальна середина"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "Вертикальна середина"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr "Chroma AGC"
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr "Подавлювач кольору"
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "Ефекти кольору"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "Керування камерою"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "Авто експозиція"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "Абсолютний час експозиції"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr "Експозиція, динамічна частота кадрів"
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr "Відносний поворот"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr "Відносний нахил"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr "Скинути поворот"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr "Скинути нахил"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr "Абсолютний поворот"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "Абсолютний фокус"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "Відносний фокус"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "Авто фокус"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr "Абсолютний зум"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr "Відносний зум"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr "Безперервний зум"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "Конфіденційність"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "Авто експозиція"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "Пріоритет авто експозиції"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "Абсолютна експозиція"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "Авто температура балансу білого"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "Температура балансу білого"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "Авто компонент балансу білого"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "Синій компонент балансу білого"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "Червоний компонент балансу білого"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "Фокус"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr "Абсолютний фокус"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "Зберегти"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "Файл №: %d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr "значення кодека"
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
@@ -464,442 +465,443 @@
 "                              частота кадрів:   \n"
 " (0 - використати значення з випадаючого списку)"
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "бітрейт:   "
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr "qmax:   "
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr "qmin:   "
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr "макс. qdiff:   "
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr "dia size:   "
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr "pre dia size:   "
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr "pre me:   "
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr "pre cmp:   "
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr "cmp:   "
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr "sub cmp:   "
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr "значення лічильника прогнозиста:   "
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr "gop size:   "
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr "qcompress   "
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr "qblur:   "
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr "subq:   "
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr "framerefs:   "
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr "me method:   "
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr "mb decision:   "
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 msgid "max B frames:   "
 msgstr "max B frames:   "
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 #, fuzzy
 msgid "num threads:   "
 msgstr "me method:   "
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "Відео та Файли"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "Пристрій:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "Частота кадрів:"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr " Показати"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "Роздільна здатність:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "Вивід камери:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "Застосувати"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "Якість:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "Файл знімку:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "Авто файл"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "Формат знімку:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "Файл відео:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "Відео-кодек:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "властивості"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "Формат відео:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---- Відео фільтри ----"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr " Гор. віддзеркал."
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr " Верт. віддзеркал."
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr " Негатив"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr " Чорно-біле"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr " Мозаїка"
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr " Часточки"
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr "значення аудіо-кодека"
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "Аудіо"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr " Звук"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "Аудіо API:"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "PORTAUDIO"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "Пристрій вводу:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Пристрій по замовч."
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "Частота дискредитації:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - моно"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - стерео"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "Канали:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "Формат аудіо:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---- Ефекти аудіо ----"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr " Ехо"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr " Пух"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr " Ревербація"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " ВахВах"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr " Голубка"
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "Лівий"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "Правий"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "Вниз"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "Вверх"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "Зупинити"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr "Відносний поворот"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr "Відносний нахил"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
 msgid "Pan Reset"
 msgstr "Скинути поворот"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
 msgid "Tilt Reset"
 msgstr "Скинути нахил"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "Скинути нахил/поворот"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr "Абсолютний фокус"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "Метод світлодіода"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "Частота світлодіода"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "Відключити обробку відео"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Сирі біти на піксель"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - стиснено"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - не стиснений YUV"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - не стиснений BMP"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG-відео 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 флеш-відео 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - відео Windows Media 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - формат MPG2"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MS MP4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr "MPEG4-ASP"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr "MPEG4-AVC (H264)"
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "Показує версію"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "Показує інформацію для відлагоджування"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "Використаний відео-пристрій default: /dev/video0"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr ""
 "Вийти після додавання керуючих елементів розширення UVC\n"
 "(потрібні права адміністратора)"
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr "Не потокове відео (керувати лише зображенням)"
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr "Метод захоплення (1-mmap (замовч.) 2-read)"
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "Файл конфігурації"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "Апаратне прискорення (увімкн.(1) | вимкн.(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
@@ -907,63 +909,63 @@
 "Формат пікселю(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "Розмір кадру (замовч. - 640x480)"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "Файл зображення"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "Інтервал між знімками (сек.)"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "Кількість знімків"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "Файл відео (запис зразу після запуску)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "Тривалість запису (сек.)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr "Вийти з Guvcview після закриття відео"
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr "Кількість початкових кадрів для пропуску"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "Відображення частоти кадрів (увімкн.(1) | вимкн. (0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "Завантажити профіль при запуску"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "- локальні параметри"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "Авто фокус (безперервний)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "встановити фокус"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 msgid "Error"
 msgstr "Помилка"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
@@ -973,23 +975,23 @@
 "Встановлено більше одного відео пристрою.\n"
 "Ви хочете спробувати ще один?\n"
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "запустити новий"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "перезавантаж."
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "новий"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "відмінити"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -998,14 +1000,26 @@
 "чи перезавантажити?\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "Завантаження файлу"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr "Попередження:"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "Не вистачає вільного місця на диску"
+
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""

guvcview-src-1.5.3.tar.gz/po/zh_TW.po -> guvcview-src-1.6.1.tar.gz/po/zh_TW.po Changed

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: guvcview\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 22:15+0100\n"
+"Report-Msgid-Bugs-To: pj.assis@gmail.com\n"
+"POT-Creation-Date: 2012-03-16 00:37+0000\n"
 "PO-Revision-Date: 2010-06-14 22:39+0800\n"
 "Last-Translator: kentxchang <kentxchang@gmail.com>\n"
 "Language-Team: none <kentxchang@gmail.com>\n"
@@ -13,16 +13,16 @@
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: TAIWAN\n"
 
-#: src/guvcview.c:289
+#: ../src/guvcview.c:285
 msgid "Guvcview Video Capture"
 msgstr "Guvcview Video Capture"
 
-#: src/guvcview.c:301
+#: ../src/guvcview.c:297
 msgid "GUVCViewer Controls"
 msgstr "GUVCViewer設定"
 
 #. can't open device
-#: src/guvcview.c:346
+#: ../src/guvcview.c:342
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -32,7 +32,7 @@
 "\n"
 "設備無法開啟"
 
-#: src/guvcview.c:347
+#: ../src/guvcview.c:343
 msgid ""
 "Please make sure the camera is connected\n"
 "and that the correct driver is installed."
@@ -41,7 +41,7 @@
 "且已安裝正確的驅動程式"
 
 #. uvc extension controls OK, give warning and shutdown (called with --add_ctrls)
-#: src/guvcview.c:352
+#: ../src/guvcview.c:348
 msgid ""
 "Guvcview:\n"
 "\n"
@@ -51,12 +51,12 @@
 "\n"
 "UVC 外掛控制"
 
-#: src/guvcview.c:353
+#: ../src/guvcview.c:349
 msgid "Extension controls were added to the UVC driver"
 msgstr "外掛控制已經被新增到UVC驅動程式中"
 
 #. uvc extension controls error - EACCES (needs root user)
-#: src/guvcview.c:360
+#: ../src/guvcview.c:356
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -66,7 +66,7 @@
 "\n"
 "UVC 外掛控制"
 
-#: src/guvcview.c:361
+#: ../src/guvcview.c:357
 msgid ""
 "An error occurred while adding extension\n"
 "controls to the UVC driver\n"
@@ -76,7 +76,7 @@
 "控制UVC驅動程式\n"
 "確定你是使用root(或sudo)來執行guvcview"
 
-#: src/guvcview.c:387 src/guvcview.c:465
+#: ../src/guvcview.c:383 ../src/guvcview.c:461
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -86,7 +86,7 @@
 "\n"
 "不能為guvcview設置一個有效視訊串流值"
 
-#: src/guvcview.c:388 src/guvcview.c:466
+#: ../src/guvcview.c:384 ../src/guvcview.c:462
 msgid ""
 "Make sure your device driver is v4l2 compliant\n"
 "and that it is properly installed."
@@ -94,7 +94,7 @@
 "請確定您的設備驅動程式符合v4l2標準\n"
 "且它已被正確安裝。"
 
-#: src/guvcview.c:410 src/guvcview.c:432
+#: ../src/guvcview.c:406 ../src/guvcview.c:428
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -104,11 +104,11 @@
 "\n"
 "無法啟動最小安裝"
 
-#: src/guvcview.c:411 src/guvcview.c:433
+#: ../src/guvcview.c:407 ../src/guvcview.c:429
 msgid "Please reconnect your camera."
 msgstr "請重新連接你的攝影機"
 
-#: src/guvcview.c:440
+#: ../src/guvcview.c:436
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -118,11 +118,11 @@
 "\n"
 "設備無法開啟"
 
-#: src/guvcview.c:441
+#: ../src/guvcview.c:437
 msgid "Make sure the device driver supports v4l2."
 msgstr "確定你的設備驅動程式支援 v4l2."
 
-#: src/guvcview.c:445
+#: ../src/guvcview.c:441
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -132,11 +132,11 @@
 "\n"
 "設備無法開啟"
 
-#: src/guvcview.c:446
+#: ../src/guvcview.c:442
 msgid "Please try mmap instead (--capture_method=1)."
 msgstr "請試試mmap而不是(--capture_method=1)."
 
-#: src/guvcview.c:454
+#: ../src/guvcview.c:450
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -146,48 +146,48 @@
 "\n"
 "設備無法開啟"
 
-#: src/guvcview.c:455
+#: ../src/guvcview.c:451
 msgid "Please try restarting your system."
 msgstr "請試試重新啟動你的系統."
 
-#: src/guvcview.c:494
+#: ../src/guvcview.c:490
 msgid "Image Controls"
 msgstr "影像設定"
 
-#: src/guvcview.c:529
+#: ../src/guvcview.c:527
 msgid "Capture:"
 msgstr "擷取:"
 
 #. increment column for labels
 #. end of control only exclusion
-#: src/guvcview.c:537
+#: ../src/guvcview.c:534
 msgid "Control Profiles:"
 msgstr "控制項目:"
 
-#: src/guvcview.c:552
+#: ../src/guvcview.c:547
 msgid "Defaults"
 msgstr "預設值"
 
 #. image auto capture
-#: src/guvcview.c:565
+#: ../src/guvcview.c:560
 msgid "Stop Auto"
 msgstr "停止 自動"
 
-#: src/guvcview.c:569 src/callbacks.c:1118 src/timers.c:114
+#: ../src/guvcview.c:564 ../src/callbacks.c:1117 ../src/timers.c:113
 msgid "Cap. Image"
 msgstr "拍照"
 
 #. vid capture enabled from start
-#: src/guvcview.c:574 src/callbacks.c:1261
+#: ../src/guvcview.c:569 ../src/callbacks.c:1251
 msgid "Stop Video"
 msgstr "停止錄影"
 
-#: src/guvcview.c:579 src/guvcview.c:795 src/callbacks.c:1194
-#: src/create_video.c:878
+#: ../src/guvcview.c:574 ../src/guvcview.c:770 ../src/callbacks.c:1193
+#: ../src/create_video.c:870
 msgid "Cap. Video"
 msgstr "錄影"
 
-#: src/guvcview.c:735
+#: ../src/guvcview.c:720
 msgid ""
 "Guvcview error:\n"
 "\n"
@@ -197,257 +197,258 @@
 "\n"
 "設備無法開啟"
 
-#: src/guvcview.c:736
+#: ../src/guvcview.c:721
 msgid "Please report it to http://developer.berlios.de/bugs/?group_id=8179"
 msgstr "請回報到http://developer.berlios.de/bugs/?group_id=8179"
 
 #. needed only for language files (not used)
 #. V4L2 control strings
-#: src/v4l2uvc.c:54
+#: ../src/v4l2uvc.c:56
 msgid "User Controls"
 msgstr "使用者設定"
 
-#: src/v4l2uvc.c:55
+#: ../src/v4l2uvc.c:57
 msgid "Brightness"
 msgstr "亮度"
 
-#: src/v4l2uvc.c:56
+#: ../src/v4l2uvc.c:58
 msgid "Contrast"
 msgstr "對比"
 
-#: src/v4l2uvc.c:57
+#: ../src/v4l2uvc.c:59
 msgid "Hue"
 msgstr "色調"
 
-#: src/v4l2uvc.c:58
+#: ../src/v4l2uvc.c:60
 msgid "Saturation"
 msgstr "飽和度"
 
-#: src/v4l2uvc.c:59
+#: ../src/v4l2uvc.c:61
 msgid "Sharpness"
 msgstr "銳利度"
 
-#: src/v4l2uvc.c:60
+#: ../src/v4l2uvc.c:62
 msgid "Gamma"
 msgstr "伽瑪值"
 
-#: src/v4l2uvc.c:61
+#: ../src/v4l2uvc.c:63
 msgid "Backlight Compensation"
 msgstr "背光補償"
 
-#: src/v4l2uvc.c:62
+#: ../src/v4l2uvc.c:64
 msgid "Power Line Frequency"
 msgstr "視訊頻率"
 
-#: src/v4l2uvc.c:63
+#: ../src/v4l2uvc.c:65
 msgid "Hue, Automatic"
 msgstr "自動色調"
 
-#: src/v4l2uvc.c:64
+#: ../src/v4l2uvc.c:66
 msgid "Focus, Auto"
 msgstr "自動對焦"
 
-#: src/v4l2uvc.c:65
+#: ../src/v4l2uvc.c:67
 msgid "Manual Mode"
 msgstr "手動模式"
 
-#: src/v4l2uvc.c:66
+#: ../src/v4l2uvc.c:68
 msgid "Auto Mode"
 msgstr "自動模式"
 
-#: src/v4l2uvc.c:67
+#: ../src/v4l2uvc.c:69
 msgid "Shutter Priority Mode"
 msgstr "快門優先模式"
 
-#: src/v4l2uvc.c:68
+#: ../src/v4l2uvc.c:70
 msgid "Aperture Priority Mode"
 msgstr "光圈優先模式"
 
-#: src/v4l2uvc.c:69
+#: ../src/v4l2uvc.c:71
 msgid "Black Level"
 msgstr "黑色等級"
 
-#: src/v4l2uvc.c:70
+#: ../src/v4l2uvc.c:72
 msgid "White Balance, Automatic"
 msgstr "自動白平衡"
 
-#: src/v4l2uvc.c:71
+#: ../src/v4l2uvc.c:73
 msgid "Do White Balance"
 msgstr "設置白平衡"
 
-#: src/v4l2uvc.c:72
+#: ../src/v4l2uvc.c:74
 msgid "Red Balance"
 msgstr "紅平衡"
 
-#: src/v4l2uvc.c:73
+#: ../src/v4l2uvc.c:75
 msgid "Blue Balance"
 msgstr "藍平衡"
 
-#: src/v4l2uvc.c:74
+#: ../src/v4l2uvc.c:76
 msgid "Exposure"
 msgstr "曝光度"
 
-#: src/v4l2uvc.c:75
+#: ../src/v4l2uvc.c:77
 msgid "Gain, Automatic"
 msgstr "自動增益"
 
-#: src/v4l2uvc.c:76
+#: ../src/v4l2uvc.c:78
 msgid "Gain"
 msgstr "增益"
 
-#: src/v4l2uvc.c:77
+#: ../src/v4l2uvc.c:79
 msgid "Horizontal Flip"
 msgstr "水平翻轉"
 
-#: src/v4l2uvc.c:78
+#: ../src/v4l2uvc.c:80
 msgid "Vertical Flip"
 msgstr "垂直翻轉"
 
-#: src/v4l2uvc.c:79
+#: ../src/v4l2uvc.c:81
 msgid "Horizontal Center"
 msgstr "水平中心"
 
-#: src/v4l2uvc.c:80
+#: ../src/v4l2uvc.c:82
 msgid "Vertical Center"
 msgstr "垂直中心"
 
-#: src/v4l2uvc.c:81
+#: ../src/v4l2uvc.c:83
 msgid "Chroma AGC"
 msgstr "濃度AGC"
 
-#: src/v4l2uvc.c:82
+#: ../src/v4l2uvc.c:84
 msgid "Color Killer"
 msgstr "顏色 killer"
 
-#: src/v4l2uvc.c:83
+#: ../src/v4l2uvc.c:85
 msgid "Color Effects"
 msgstr "色彩效果"
 
 #. CAMERA CLASS control strings
-#: src/v4l2uvc.c:86
+#: ../src/v4l2uvc.c:88
 msgid "Camera Controls"
 msgstr "攝影機設定"
 
-#: src/v4l2uvc.c:87
+#: ../src/v4l2uvc.c:89
 msgid "Auto Exposure"
 msgstr "自動曝光"
 
-#: src/v4l2uvc.c:88
+#: ../src/v4l2uvc.c:90
 msgid "Exposure Time, Absolute"
 msgstr "絕對曝光時間"
 
-#: src/v4l2uvc.c:89
+#: ../src/v4l2uvc.c:91
 msgid "Exposure, Dynamic Framerate"
 msgstr "曝光，動態碼率"
 
-#: src/v4l2uvc.c:90
+#: ../src/v4l2uvc.c:92
 msgid "Pan, Relative"
 msgstr "筆,相對的"
 
-#: src/v4l2uvc.c:91
+#: ../src/v4l2uvc.c:93
 msgid "Tilt, Relative"
 msgstr "傾斜,相對的"
 
-#: src/v4l2uvc.c:92
+#: ../src/v4l2uvc.c:94
 msgid "Pan, Reset"
 msgstr "筆,重設"
 
-#: src/v4l2uvc.c:93
+#: ../src/v4l2uvc.c:95
 msgid "Tilt, Reset"
 msgstr "傾斜,重設"
 
-#: src/v4l2uvc.c:94
+#: ../src/v4l2uvc.c:96
 msgid "Pan, Absolute"
 msgstr "筆,絕對的"
 
-#: src/v4l2uvc.c:96
+#: ../src/v4l2uvc.c:98
 msgid "Focus, Absolute"
 msgstr "對焦,絕對的"
 
-#: src/v4l2uvc.c:97
+#: ../src/v4l2uvc.c:99
 msgid "Focus, Relative"
 msgstr "對焦,相對的"
 
-#: src/v4l2uvc.c:98
+#: ../src/v4l2uvc.c:100
 msgid "Focus, Automatic"
 msgstr "對焦,自動"
 
-#: src/v4l2uvc.c:99
+#: ../src/v4l2uvc.c:101
 msgid "Zoom, Absolute"
 msgstr "變焦,絕對的"
 
-#: src/v4l2uvc.c:100
+#: ../src/v4l2uvc.c:102
 msgid "Zoom, Relative"
 msgstr "變焦,相對的"
 
-#: src/v4l2uvc.c:101
+#: ../src/v4l2uvc.c:103
 msgid "Zoom, Continuous"
 msgstr "變焦,連續的"
 
-#: src/v4l2uvc.c:102
+#: ../src/v4l2uvc.c:104
 msgid "Privacy"
 msgstr "隱私"
 
 #. UVC specific control strings
-#: src/v4l2uvc.c:105
+#: ../src/v4l2uvc.c:107
 msgid "Exposure, Auto"
 msgstr "曝光，自動"
 
-#: src/v4l2uvc.c:106
+#: ../src/v4l2uvc.c:108
 msgid "Exposure, Auto Priority"
 msgstr "曝光，自動優先"
 
-#: src/v4l2uvc.c:107
+#: ../src/v4l2uvc.c:109
 msgid "Exposure (Absolute)"
 msgstr "曝光（絕對）"
 
-#: src/v4l2uvc.c:108
+#: ../src/v4l2uvc.c:110
 msgid "White Balance Temperature, Auto"
 msgstr "白平衡溫度，自動"
 
-#: src/v4l2uvc.c:109
+#: ../src/v4l2uvc.c:111
 msgid "White Balance Temperature"
 msgstr "白平衡溫度"
 
-#: src/v4l2uvc.c:110
+#: ../src/v4l2uvc.c:112
 msgid "White Balance Component, Auto"
 msgstr "白平衡元件,自動"
 
-#: src/v4l2uvc.c:111
+#: ../src/v4l2uvc.c:113
 msgid "White Balance Blue Component"
 msgstr "白平衡藍元件"
 
-#: src/v4l2uvc.c:112
+#: ../src/v4l2uvc.c:114
 msgid "White Balance Red Component"
 msgstr "白平衡紅元件"
 
 #. libwebcam specific control strings
-#: src/v4l2uvc.c:115
+#: ../src/v4l2uvc.c:117
 msgid "Focus"
 msgstr "對焦"
 
-#: src/v4l2uvc.c:116
+#: ../src/v4l2uvc.c:118
 msgid "Focus (Absolute)"
 msgstr "對焦(絕對的)"
 
-#: src/video_tab.c:41 src/callbacks.c:1331
+#: ../src/video_tab.c:41 ../src/callbacks.c:1321
 msgid "Save File"
 msgstr "存檔"
 
 #. if auto naming restart counter
-#: src/video_tab.c:76 src/video_tab.c:106 src/globals.c:73 src/globals.c:76
-#: src/options.c:326 src/options.c:445 src/options.c:502 src/callbacks.c:608
-#: src/callbacks.c:890 src/callbacks.c:1039 src/callbacks.c:1056
-#: src/callbacks.c:1092 src/callbacks.c:1207 src/timers.c:98
+#: ../src/video_tab.c:76 ../src/video_tab.c:106 ../src/globals.c:78
+#: ../src/globals.c:81 ../src/options.c:333 ../src/options.c:452
+#: ../src/options.c:509 ../src/callbacks.c:607 ../src/callbacks.c:889
+#: ../src/callbacks.c:1038 ../src/callbacks.c:1055 ../src/callbacks.c:1091
+#: ../src/callbacks.c:1206 ../src/timers.c:97
 #, c-format
 msgid "File num:%d"
 msgstr "命名起始值:%d"
 
-#: src/video_tab.c:126
+#: ../src/video_tab.c:126
 msgid "codec values"
 msgstr "編解碼器的值"
 
-#: src/video_tab.c:137
+#: ../src/video_tab.c:137
 msgid ""
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
@@ -455,441 +456,442 @@
 "                              encoder fps:   \n"
 " (0 - use fps combobox value)"
 
-#: src/video_tab.c:152
+#: ../src/video_tab.c:150
 msgid " monotonic pts"
 msgstr ""
 
 #. bit rate
-#: src/video_tab.c:160 src/audio_tab.c:58
+#: ../src/video_tab.c:157 ../src/audio_tab.c:59
 msgid "bit rate:   "
 msgstr "bit rate:   "
 
-#: src/video_tab.c:175
+#: ../src/video_tab.c:170
 msgid "qmax:   "
 msgstr "qmax:   "
 
-#: src/video_tab.c:190
+#: ../src/video_tab.c:183
 msgid "qmin:   "
 msgstr "qmin:   "
 
-#: src/video_tab.c:205
+#: ../src/video_tab.c:196
 msgid "max. qdiff:   "
 msgstr "max. qdiff:   "
 
-#: src/video_tab.c:220
+#: ../src/video_tab.c:209
 msgid "dia size:   "
 msgstr "dia size:   "
 
-#: src/video_tab.c:235
+#: ../src/video_tab.c:222
 msgid "pre dia size:   "
 msgstr "pre dia size:   "
 
-#: src/video_tab.c:250
+#: ../src/video_tab.c:235
 msgid "pre me:   "
 msgstr "pre me:   "
 
-#: src/video_tab.c:265
+#: ../src/video_tab.c:248
 msgid "pre cmp:   "
 msgstr "pre cmp:   "
 
-#: src/video_tab.c:280
+#: ../src/video_tab.c:261
 msgid "cmp:   "
 msgstr "cmp:   "
 
-#: src/video_tab.c:295
+#: ../src/video_tab.c:274
 msgid "sub cmp:   "
 msgstr "sub cmp:   "
 
-#: src/video_tab.c:310
+#: ../src/video_tab.c:287
 msgid "last predictor count:   "
 msgstr "last predictor count:   "
 
-#: src/video_tab.c:325
+#: ../src/video_tab.c:300
 msgid "gop size:   "
 msgstr "gop size:   "
 
-#: src/video_tab.c:340
+#: ../src/video_tab.c:313
 msgid "qcompress:   "
 msgstr "qcompress:   "
 
-#: src/video_tab.c:355
+#: ../src/video_tab.c:326
 msgid "qblur:   "
 msgstr "qblur:   "
 
-#: src/video_tab.c:370
+#: ../src/video_tab.c:339
 msgid "subq:   "
 msgstr "subq:   "
 
-#: src/video_tab.c:385
+#: ../src/video_tab.c:352
 msgid "framerefs:   "
 msgstr "framerefs:   "
 
-#: src/video_tab.c:400
+#: ../src/video_tab.c:365
 msgid "me method:   "
 msgstr "me method:   "
 
-#: src/video_tab.c:415
+#: ../src/video_tab.c:378
 msgid "mb decision:   "
 msgstr "mb decision:   "
 
-#: src/video_tab.c:430
+#: ../src/video_tab.c:391
 #, fuzzy
 msgid "max B frames:   "
 msgstr "framerefs:   "
 
-#: src/video_tab.c:445
+#: ../src/video_tab.c:404
 #, fuzzy
 msgid "num threads:   "
 msgstr "me method:   "
 
-#: src/video_tab.c:555
+#: ../src/video_tab.c:516
 msgid "Video & Files"
 msgstr "影像&檔案"
 
 #. Devices
-#: src/video_tab.c:571 src/callbacks.c:136
+#: ../src/video_tab.c:532 ../src/callbacks.c:137
 msgid "Device:"
 msgstr "設備:"
 
-#: src/video_tab.c:673
+#: ../src/video_tab.c:637
 msgid "Frame Rate:"
 msgstr "影格率"
 
-#: src/video_tab.c:681
+#: ../src/video_tab.c:644
 msgid " Show"
 msgstr "顯示"
 
-#: src/video_tab.c:705
+#: ../src/video_tab.c:666
 msgid "Resolution:"
 msgstr "影像尺寸:"
 
-#: src/video_tab.c:731
+#: ../src/video_tab.c:692
 msgid "Camera Output:"
 msgstr "攝影機輸出:"
 
-#: src/video_tab.c:753
+#: ../src/video_tab.c:714
 msgid "Apply"
 msgstr "套用"
 
-#: src/video_tab.c:761
+#: ../src/video_tab.c:721
 msgid "Quality:"
 msgstr "品質:"
 
-#: src/video_tab.c:771
+#: ../src/video_tab.c:730
 msgid "Image File:"
 msgstr "照片檔名:"
 
-#: src/video_tab.c:804 src/video_tab.c:898
+#: ../src/video_tab.c:761 ../src/video_tab.c:851
 msgid "File,Auto"
 msgstr "檔案,自動"
 
-#: src/video_tab.c:815
+#: ../src/video_tab.c:771
 msgid "Image Format:"
 msgstr "圖片格式:"
 
-#: src/video_tab.c:841
+#: ../src/video_tab.c:797
 msgid "Take Picture by Default"
 msgstr ""
 
-#: src/video_tab.c:853
+#: ../src/video_tab.c:808
 msgid "Video File:"
 msgstr "影像檔名:"
 
-#: src/video_tab.c:931
+#: ../src/video_tab.c:884
 msgid "Video Codec:"
 msgstr "影像編碼:"
 
 #. lavc codec properties button
-#: src/video_tab.c:939 src/audio_tab.c:346
+#: ../src/video_tab.c:891 ../src/audio_tab.c:347
 msgid "properties"
 msgstr "特性"
 
-#: src/video_tab.c:966
+#: ../src/video_tab.c:918
 msgid "Video Format:"
 msgstr "影像格式:"
 
-#: src/video_tab.c:973
+#: ../src/video_tab.c:924
 msgid "Take Video by Default"
 msgstr ""
 
-#: src/video_tab.c:984
+#: ../src/video_tab.c:934
 msgid "---- Video Filters ----"
 msgstr "---影像濾波器---"
 
 #. Mirror
-#: src/video_tab.c:999
+#: ../src/video_tab.c:953
 msgid " Mirror"
 msgstr "鏡像(水平翻轉)"
 
 #. Upturn
-#: src/video_tab.c:1009
+#: ../src/video_tab.c:964
 msgid " Invert"
 msgstr "倒置(垂直翻轉)"
 
 #. Negate
-#: src/video_tab.c:1019
+#: ../src/video_tab.c:975
 msgid " Negative"
 msgstr "負片效果"
 
 #. Mono
-#: src/video_tab.c:1029
+#: ../src/video_tab.c:986
 msgid " Mono"
 msgstr "灰階"
 
 #. Pieces
-#: src/video_tab.c:1040
+#: ../src/video_tab.c:998
 msgid " Pieces"
 msgstr "馬賽克"
 
 #. Particles
-#: src/video_tab.c:1051
+#: ../src/video_tab.c:1010
 msgid " Particles"
 msgstr "顆粒"
 
-#: src/audio_tab.c:46
+#: ../src/audio_tab.c:46
 msgid "audio codec values"
 msgstr "音頻編碼器數值"
 
-#: src/audio_tab.c:132
+#: ../src/audio_tab.c:136
 msgid "Audio"
 msgstr "音頻"
 
-#: src/audio_tab.c:150
+#: ../src/audio_tab.c:154
 msgid " Sound"
 msgstr "聲音"
 
 #. VU meter on the image (OSD)
-#: src/audio_tab.c:162
+#: ../src/audio_tab.c:165
 msgid " Show VU meter"
 msgstr ""
 
-#: src/audio_tab.c:175
+#: ../src/audio_tab.c:177
 msgid "Audio API:"
 msgstr "音頻API:"
 
-#: src/audio_tab.c:185
+#: ../src/audio_tab.c:188
 msgid "PORTAUDIO"
 msgstr "PORTAUDIO"
 
-#: src/audio_tab.c:186
+#: ../src/audio_tab.c:189
 msgid "PULSEAUDIO"
 msgstr "PULSEAUDIO"
 
-#: src/audio_tab.c:202 src/audio_tab.c:225
+#: ../src/audio_tab.c:205 ../src/audio_tab.c:227
 msgid "Input Device:"
 msgstr "輸入設備:"
 
-#: src/audio_tab.c:236 src/audio_tab.c:268
+#: ../src/audio_tab.c:237 ../src/audio_tab.c:269
 msgid "Dev. Default"
 msgstr "Dev. Default"
 
-#: src/audio_tab.c:257
+#: ../src/audio_tab.c:259
 msgid "Sample Rate:"
 msgstr "範例碼率:"
 
-#: src/audio_tab.c:269
+#: ../src/audio_tab.c:270
 msgid "1 - mono"
 msgstr "1 - mono"
 
-#: src/audio_tab.c:270
+#: ../src/audio_tab.c:271
 msgid "2 - stereo"
 msgstr "2 - stereo"
 
-#: src/audio_tab.c:304
+#: ../src/audio_tab.c:306
 msgid "Channels:"
 msgstr "聲道:"
 
-#: src/audio_tab.c:338
+#: ../src/audio_tab.c:340
 msgid "Audio Format:"
 msgstr "音頻格式:"
 
-#: src/audio_tab.c:356
+#: ../src/audio_tab.c:356
 msgid "---- Audio Effects ----"
 msgstr "---音頻效果---"
 
 #. Echo
-#: src/audio_tab.c:375
+#: ../src/audio_tab.c:375
 msgid " Echo"
 msgstr "迴聲"
 
 #. FUZZ
-#: src/audio_tab.c:385
+#: ../src/audio_tab.c:386
 msgid " Fuzz"
 msgstr "模糊"
 
 #. Reverb
-#: src/audio_tab.c:396
+#: ../src/audio_tab.c:398
 msgid " Reverb"
 msgstr "Reverb"
 
 #. WahWah
-#: src/audio_tab.c:407
+#: ../src/audio_tab.c:410
 msgid " WahWah"
 msgstr " WahWah"
 
 #. Ducky
-#: src/audio_tab.c:418
+#: ../src/audio_tab.c:422
 msgid " Ducky"
 msgstr " Ducky"
 
-#: src/v4l2_controls.c:732
+#: ../src/v4l2_controls.c:712
 msgid "Left"
 msgstr "左"
 
-#: src/v4l2_controls.c:733
+#: ../src/v4l2_controls.c:713
 msgid "Right"
 msgstr "右"
 
-#: src/v4l2_controls.c:737
+#: ../src/v4l2_controls.c:717
 msgid "Down"
 msgstr "下"
 
-#: src/v4l2_controls.c:738
+#: ../src/v4l2_controls.c:718
 msgid "Up"
 msgstr "上"
 
-#: src/v4l2_controls.c:787
+#: ../src/v4l2_controls.c:763
 msgid "Off"
 msgstr ""
 
-#: src/v4l2_controls.c:790
+#: ../src/v4l2_controls.c:763
 msgid "On"
 msgstr ""
 
-#: src/v4l2_controls.c:793
+#: ../src/v4l2_controls.c:763
 msgid "Blinking"
 msgstr ""
 
-#: src/v4l2_controls.c:796
+#: ../src/v4l2_controls.c:763
 #, fuzzy
 msgid "Auto"
 msgstr "停止 自動"
 
-#: src/v4l2_controls.c:814
+#. turn it into a menu control
+#: ../src/v4l2_controls.c:814
 msgid "8 bit"
 msgstr ""
 
-#: src/v4l2_controls.c:817
+#: ../src/v4l2_controls.c:814
 msgid "12 bit"
 msgstr ""
 
-#: src/v4l2_dyna_ctrls.c:89
+#: ../src/v4l2_dyna_ctrls.c:89
 msgid "Pan (relative)"
 msgstr "Pan (相對的)"
 
-#: src/v4l2_dyna_ctrls.c:99
+#: ../src/v4l2_dyna_ctrls.c:99
 msgid "Tilt (relative)"
 msgstr "傾斜(相對的)"
 
-#: src/v4l2_dyna_ctrls.c:109
+#: ../src/v4l2_dyna_ctrls.c:109
 msgid "Pan Reset"
 msgstr "Pan 重設"
 
-#: src/v4l2_dyna_ctrls.c:119
+#: ../src/v4l2_dyna_ctrls.c:119
 msgid "Tilt Reset"
 msgstr "傾斜重設"
 
-#: src/v4l2_dyna_ctrls.c:129
+#: ../src/v4l2_dyna_ctrls.c:129
 msgid "Pan/tilt Reset"
 msgstr "Pan/Tilt重設"
 
-#: src/v4l2_dyna_ctrls.c:139
+#: ../src/v4l2_dyna_ctrls.c:139
 msgid "Focus (absolute)"
 msgstr "對焦(絕對值)"
 
-#: src/v4l2_dyna_ctrls.c:149
+#: ../src/v4l2_dyna_ctrls.c:149
 msgid "LED1 Mode"
 msgstr "LED1模式"
 
-#: src/v4l2_dyna_ctrls.c:159
+#: ../src/v4l2_dyna_ctrls.c:159
 msgid "LED1 Frequency"
 msgstr "LED1頻率"
 
-#: src/v4l2_dyna_ctrls.c:169
+#: ../src/v4l2_dyna_ctrls.c:169
 msgid "Disable video processing"
 msgstr "停用影像處理"
 
-#: src/v4l2_dyna_ctrls.c:179
+#: ../src/v4l2_dyna_ctrls.c:179
 msgid "Raw bits per pixel"
 msgstr "Raw bits per pixel"
 
-#: src/vcodecs.c:62
+#: ../src/vcodecs.c:62
 msgid "MJPG - compressed"
 msgstr "MJPG - compressed"
 
-#: src/vcodecs.c:97
+#: ../src/vcodecs.c:97
 msgid "YUY2 - uncomp YUV"
 msgstr "YUY2 - uncomp YUV"
 
-#: src/vcodecs.c:132
+#: ../src/vcodecs.c:132
 msgid "RGB - uncomp BMP"
 msgstr "RGB - uncomp BMP"
 
-#: src/vcodecs.c:167
+#: ../src/vcodecs.c:167
 msgid "MPEG video 1"
 msgstr "MPEG video 1"
 
-#: src/vcodecs.c:202
+#: ../src/vcodecs.c:202
 msgid "FLV1 - flash video 1"
 msgstr "FLV1 - flash video 1"
 
-#: src/vcodecs.c:237
+#: ../src/vcodecs.c:237
 msgid "WMV1 - win. med. video 7"
 msgstr "WMV1 - win. med. video 7"
 
-#: src/vcodecs.c:272
+#: ../src/vcodecs.c:272
 msgid "MPG2 - MPG2 format"
 msgstr "MPG2 - MPG2 format"
 
-#: src/vcodecs.c:307
+#: ../src/vcodecs.c:307
 msgid "MS MP4 V3"
 msgstr "MS MP4 V3"
 
-#: src/vcodecs.c:342
+#: ../src/vcodecs.c:342
 msgid "MPEG4-ASP"
 msgstr "MPEG4-ASP"
 
-#: src/vcodecs.c:377
+#: ../src/vcodecs.c:377
 msgid "MPEG4-AVC (H264)"
 msgstr "MPEG4-AVC (H264)"
 
-#: src/options.c:753
+#: ../src/options.c:761
 msgid "Prints version"
 msgstr "列印版本"
 
-#: src/options.c:754
+#: ../src/options.c:762
 msgid "Displays debug information"
 msgstr "顯示debug訊息"
 
-#: src/options.c:755
+#: ../src/options.c:763
 msgid "Video Device to use default: /dev/video0"
 msgstr "使用影像設備default: /dev/video0"
 
-#: src/options.c:756
+#: ../src/options.c:764
 msgid "Exit after adding UVC extension controls (needs root/sudo)"
 msgstr "在新增外掛控制後離開(需要使用root/sudo)"
 
-#: src/options.c:757
+#: ../src/options.c:765
 msgid "Don't stream video (image controls only)"
 msgstr "不能串流影像(只能控制圖片)"
 
-#: src/options.c:758
+#: ../src/options.c:766
 msgid "Don't display a GUI"
 msgstr ""
 
-#: src/options.c:759
+#: ../src/options.c:767
 msgid "Capture method (1-mmap (default)  2-read)"
 msgstr "擷取方法(1-mmap (default)  2-read)"
 
-#: src/options.c:760
+#: ../src/options.c:768
 msgid "Configuration file"
 msgstr "設置檔案"
 
-#: src/options.c:761
+#: ../src/options.c:769
 msgid "Hardware accelaration (enable(1) | disable(0))"
 msgstr "硬體加速(啟用(1) | 停用(0))"
 
-#: src/options.c:762
+#: ../src/options.c:770
 #, fuzzy
 msgid ""
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
@@ -898,87 +900,87 @@
 "Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|"
 "y41p|grey|s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"
 
-#: src/options.c:763
+#: ../src/options.c:771
 msgid "Frame size, default: 640x480"
 msgstr "影格尺寸,預設值:640x480"
 
-#: src/options.c:764
+#: ../src/options.c:772
 msgid "Image File name"
 msgstr "圖片檔案名稱"
 
-#: src/options.c:765
+#: ../src/options.c:773
 msgid "Image capture interval in seconds"
 msgstr "圖片擷取間隔秒數"
 
-#: src/options.c:766
+#: ../src/options.c:774
 msgid "Number of Pictures to capture"
 msgstr "圖片擷取數"
 
-#: src/options.c:767
+#: ../src/options.c:775
 msgid "Video File name (capture from start)"
 msgstr "影像檔案名稱(從開始擷取)"
 
-#: src/options.c:768
+#: ../src/options.c:776
 msgid "Video capture time (in seconds)"
 msgstr "影像擷取時間(秒數)"
 
-#: src/options.c:769
+#: ../src/options.c:777
 msgid "Exits guvcview after closing video"
 msgstr "在關掉影像後離開guvcview"
 
-#: src/options.c:770
+#: ../src/options.c:778
 msgid "Number of initial frames to skip"
 msgstr "跳過的初始影格數"
 
-#: src/options.c:771
+#: ../src/options.c:779
 msgid "Show FPS value (enable(1) | disable (0))"
 msgstr "顯示FPS值(啟用(1) | 停用 (0))"
 
-#: src/options.c:772
+#: ../src/options.c:780
 msgid "Load Profile at start"
 msgstr "在啟動時讀取專案"
 
-#: src/options.c:778
+#: ../src/options.c:786
 msgid "- local options"
 msgstr "-本地選項"
 
-#: src/img_controls.c:117
+#: ../src/img_controls.c:121
 msgid "Auto Focus (continuous)"
 msgstr "自動對焦(連續)"
 
-#: src/img_controls.c:118
+#: ../src/img_controls.c:122
 msgid "set Focus"
 msgstr "設定焦點"
 
-#: src/callbacks.c:102
+#: ../src/callbacks.c:106
 #, fuzzy
 msgid "Error"
 msgstr "鏡像(水平翻轉)"
 
-#: src/callbacks.c:128
+#: ../src/callbacks.c:130
 msgid ""
 "\n"
 "You have more than one video device installed.\n"
 "Do you want to try another one ?\n"
 msgstr ""
 
-#: src/callbacks.c:659
+#: ../src/callbacks.c:658
 msgid "start new"
 msgstr "馬上啟動"
 
-#: src/callbacks.c:662
+#: ../src/callbacks.c:661
 msgid "restart"
 msgstr "重新啟動"
 
-#: src/callbacks.c:664
+#: ../src/callbacks.c:663
 msgid "new"
 msgstr "新增"
 
-#: src/callbacks.c:666
+#: ../src/callbacks.c:665
 msgid "cancel"
 msgstr "取消"
 
-#: src/callbacks.c:671
+#: ../src/callbacks.c:670
 msgid ""
 "launch new process or restart?.\n"
 "\n"
@@ -986,14 +988,26 @@
 "啟動新的程序或重新啟動?\n"
 "\n"
 
-#: src/callbacks.c:1344
+#: ../src/callbacks.c:1334
 msgid "Load File"
 msgstr "讀取檔案"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Guvcview Warning:"
 msgstr "Guvcview警告:"
 
-#: src/timers.c:212
+#: ../src/timers.c:211
 msgid "Not enough free space left on disk"
 msgstr "在硬碟上沒有足夠的剩餘空間"
+
+#: ../data/guvcview.desktop.in.h:1
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:2
+msgid "GTK UVC video viewer"
+msgstr ""
+
+#: ../data/guvcview.desktop.in.h:3
+msgid "guvcview"
+msgstr ""

guvcview-src-1.5.3.tar.gz/src/Makefile.am -> guvcview-src-1.6.1.tar.gz/src/Makefile.am Changed

guvcview-src-1.5.3.tar.gz/src/Makefile.in -> guvcview-src-1.6.1.tar.gz/src/Makefile.in Changed

guvcview-src-1.5.3.tar.gz/src/acodecs.c -> guvcview-src-1.6.1.tar.gz/src/acodecs.c Changed

@@ -31,6 +31,8 @@
 #include <glib/gi18n.h>
 #include <linux/videodev2.h>
 
+#define __FMUTEX &global->file_mutex
+
 /* AAC object types index: MAIN = 1; LOW = 2; SSR = 3; LTP = 4*/
 static int AAC_OBJ_TYPE5 = 
 	{ FF_PROFILE_UNKNOWN, FF_PROFILE_AAC_MAIN, FF_PROFILE_AAC_LOW, FF_PROFILE_AAC_SSR, FF_PROFILE_AAC_LTP };
@@ -240,10 +242,11 @@
 	return (listSupACodecsget_real_index (codec_ind).avcodec);
 }
 
-void setAcodecVal ()
+int getAcodecNum()
 {
 	AVCodec *codec;
 	int ind = 0;
+	int num_codecs = 1; //pcm is always valid
 	for (ind=0;ind<MAX_ACODECS;ind++)
 	{
 		if (isLavcACodec(ind))
@@ -254,8 +257,12 @@
 				g_print("no codec detected for %s\n", listSupACodecsind.description);
 				listSupACodecsind.valid = FALSE;
 			}
+			else
+				num_codecs++;
 		}
 	}
+	
+	return num_codecs;
 }
 
 gboolean isAcodecValid(int codec_ind)
@@ -275,6 +282,8 @@
 	
 	int ret =0;
 	
+	__LOCK_MUTEX( __FMUTEX );
+	
 	switch (global->VidFormat)
 	{
 		case AVI_FORMAT:
@@ -293,12 +302,12 @@
 			break;
 	}
 	
+	__UNLOCK_MUTEX( __FMUTEX );
+	
 	return (ret);
 }
 
-static int encode_lavc_audio (struct lavcAData *lavc_data, 
-	struct ALL_DATA *all_data, 
-	AudBuff *proc_buff)
+static int encode_lavc_audio ( struct ALL_DATA *all_data )
 {
 	struct paRecordData *pdata = all_data->pdata;
 	struct VideoFormatData *videoF = all_data->videoF;
@@ -308,22 +317,20 @@
 	
 	videoF->old_apts = videoF->apts;
 	
-	if(lavc_data)
+	if(pdata->lavc_data)
 	{
-		/*lavc is initialized when setting sound*/
-		framesize= encode_lavc_audio_frame (pdata->pcm_sndBuff, lavc_data, videoF);
-		
-		ret = write_audio_data (all_data, lavc_data->outbuf, framesize, proc_buff->time_stamp);
+		if(pdata->lavc_data->codec_context->sample_fmt == AV_SAMPLE_FMT_FLT)
+			framesize= encode_lavc_audio_frame (pdata->float_sndBuff, pdata->lavc_data, videoF);
+		else
+			framesize= encode_lavc_audio_frame (pdata->pcm_sndBuff, pdata->lavc_data, videoF);
+	
+		ret = write_audio_data (all_data, pdata->lavc_data->outbuf, framesize, pdata->audio_buffpdata->br_indpdata->r_ind.time_stamp);
 	}
 	return (ret);
 }
 		   
-int compress_audio_frame(void *data, 
-	void *lav_aud_data,
-	AudBuff *proc_buff)
-{
-	struct lavcAData **lavc_data = (struct lavcAData **) lav_aud_data;
-	
+int compress_audio_frame(void *data)
+{	
 	struct ALL_DATA *all_data = (struct ALL_DATA *) data;
 	struct GLOBAL *global = all_data->global;
 	struct paRecordData *pdata = all_data->pdata;
@@ -335,15 +342,14 @@
 		/*write audio chunk*/
 		case PA_FOURCC: 
 		{
-			Float2Int16(pdata, proc_buff); /*convert from float sample to 16 bit PCM*/
-			ret = write_audio_data (all_data, (BYTE *) pdata->pcm_sndBuff, pdata->aud_numSamples*2, proc_buff->time_stamp);
+			SampleConverter(pdata); /*convert from float sample to 16 bit PCM*/
+			ret = write_audio_data (all_data, (BYTE *) pdata->pcm_sndBuff, pdata->aud_numSamples*2, pdata->audio_buffpdata->br_indpdata->r_ind.time_stamp);
 			break;
 		}
 		default:
 		{
-			//Argh! libavcodec 7.1 only seems to accept S16 sample_fmt
-			Float2Int16(pdata, proc_buff); /*convert from float sample to 16 bit PCM*/
-			ret = encode_lavc_audio (*lavc_data, all_data, proc_buff);
+			SampleConverter(pdata);
+			ret = encode_lavc_audio (all_data);
 			break;
 		}
 	}

guvcview-src-1.5.3.tar.gz/src/acodecs.h -> guvcview-src-1.6.1.tar.gz/src/acodecs.h Changed

guvcview-src-1.5.3.tar.gz/src/audio_tab.c -> guvcview-src-1.6.1.tar.gz/src/audio_tab.c Changed

@@ -183,7 +183,7 @@
 	gwidget->SndAPI = gtk_combo_box_text_new ();
 	gtk_widget_set_halign (gwidget->SndAPI, GTK_ALIGN_FILL);
 	gtk_widget_set_hexpand (gwidget->SndAPI, TRUE);
-	gtk_grid_attach(GTK_GRID(table3), gwidget->SndAPI, 1, line, 2, 1);
+	gtk_grid_attach(GTK_GRID(table3), gwidget->SndAPI, 1, line, 1, 1);
 	
 	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gwidget->SndAPI),_("PORTAUDIO"));
 	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gwidget->SndAPI),_("PULSEAUDIO"));
@@ -191,7 +191,7 @@
 	//default API - portaudio
 	gtk_combo_box_set_active(GTK_COMBO_BOX(gwidget->SndAPI),global->Sound_API);
 	
-	if(global->Sound_API > 0) global->Sound_UseDev=-1; //force default device
+	//if(global->Sound_API > 0) global->Sound_UseDev=-1; //force default device
 	
 	gtk_widget_set_sensitive (gwidget->SndAPI, TRUE);
 	g_signal_connect (GTK_COMBO_BOX_TEXT(gwidget->SndAPI), "changed",
@@ -210,6 +210,7 @@
 	
 	// get sound device list and info
 	gwidget->SndDevice = list_snd_devices (global);
+
 	gtk_widget_set_halign (gwidget->SndDevice, GTK_ALIGN_FILL);
 	gtk_widget_set_hexpand (gwidget->SndDevice, TRUE);
 	gtk_grid_attach(GTK_GRID(table3), gwidget->SndDevice, 1, line, 1, 1);
@@ -219,8 +220,8 @@
 	gtk_combo_box_set_active(GTK_COMBO_BOX(gwidget->SndDevice),global->Sound_UseDev);
 	
 	//disable if using pulse api
-	if (global->Sound_enable && !global->Sound_API) gtk_widget_set_sensitive (gwidget->SndDevice, TRUE);
-	else  gtk_widget_set_sensitive (gwidget->SndDevice, FALSE);
+	//if (global->Sound_enable && !global->Sound_API) gtk_widget_set_sensitive (gwidget->SndDevice, TRUE);
+	//else  gtk_widget_set_sensitive (gwidget->SndDevice, FALSE);
 	g_signal_connect (GTK_COMBO_BOX_TEXT(gwidget->SndDevice), "changed",
 		G_CALLBACK (SndDevice_changed), all_data);
 	
@@ -314,14 +315,10 @@
 	line++;
 	gwidget->SndComp = gtk_combo_box_text_new ();
 	//sets to valid only existing codecs
-	setAcodecVal ();
+	int num_codecs = getAcodecNum();
 	int acodec_ind =0;
-	for (acodec_ind =0; acodec_ind<MAX_ACODECS; acodec_ind++)
-	{
-		if (isAcodecValid(acodec_ind))
-			gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gwidget->SndComp),gettext(get_aud_desc4cc(acodec_ind)));
-		
-	}
+	for (acodec_ind =0; acodec_ind < num_codecs; acodec_ind++)
+		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gwidget->SndComp),gettext(get_aud_desc4cc(acodec_ind)));
 
 	int aud_ind = get_ind_by4cc(global->Sound_Format);
 	gtk_combo_box_set_active(GTK_COMBO_BOX(gwidget->SndComp), aud_ind);

guvcview-src-1.5.3.tar.gz/src/callbacks.c -> guvcview-src-1.6.1.tar.gz/src/callbacks.c Changed

guvcview-src-1.5.3.tar.gz/src/colorspaces.c -> guvcview-src-1.6.1.tar.gz/src/colorspaces.c Changed

@@ -132,6 +132,61 @@
 	preverse=NULL;
 }
 
+/* Unpack buffer of (vw bit) data into padded 16bit buffer. */
+static inline void convert_packed_to_16bit(uint8_t *raw, uint16_t *unpacked, int vw, int unpacked_len)
+{
+	int mask = (1 << vw) - 1;
+	uint32_t buffer = 0;
+	int bitsIn = 0;
+	while (unpacked_len--) {
+		while (bitsIn < vw) {
+			buffer = (buffer << 8) | *(raw++);
+			bitsIn += 8;
+		}
+		bitsIn -= vw;
+		*(unpacked++) = (buffer >> bitsIn) & mask;
+	}
+}
+
+/*convert y10b (bit-packed array greyscale format) to yuyv (packed)
+* args:
+*      framebuffer: pointer to frame buffer (yuyv)
+*      tmpbuffer: pointer to temp buffer containing y10b (bit-packed array) data frame
+*      width: picture width
+*      height: picture height
+*/
+void y10b_to_yuyv (BYTE *framebuffer, BYTE *tmpbuffer, int width, int height)
+{
+	UINT16 *unpacked_buffer = NULL;
+	UINT16 *ptmp;
+	int h = 0;
+	int w = 0;
+
+	unpacked_buffer = malloc(width * height * sizeof(UINT16));
+	convert_packed_to_16bit(tmpbuffer, unpacked_buffer, 10, width * height);
+
+	ptmp = unpacked_buffer;
+
+	for (h = 0; h < height; h++)
+	{
+		for (w = 0; w < width; w += 2)
+		{
+			/* Y0 */
+			*framebuffer++ = (BYTE) ((ptmp0 & 0x3FF) >> 2);
+			/* U */
+			*framebuffer++ = 0x80;
+			/* Y1 */
+			*framebuffer++ = (BYTE) ((ptmp1 & 0x3FF) >> 2);
+			/* V */
+			*framebuffer++ = 0x80;
+
+			ptmp += 2;
+		}
+	}
+	
+	free(unpacked_buffer);
+}
+
 /*convert y16 (grey) to yuyv (packed)
 * args: 
 *      framebuffer: pointer to frame buffer (yuyv)
@@ -151,14 +206,14 @@
 		for(w=0;w<width;w+=2) 
 		{
 			/* Y0 */
-			*framebuffer++ = (BYTE) (ptmp0 & 0xFF00) >> 8;
+			*framebuffer++ = (BYTE) ((ptmp0 & 0xFF00) >> 8);
 			/* U */
-			*framebuffer++ = 0x7F;
+			*framebuffer++ = 0x80;
 			/* Y1 */
-			*framebuffer++ = (BYTE) (ptmp1 & 0xFF00) >> 8;
+			*framebuffer++ = (BYTE) ((ptmp1 & 0xFF00) >> 8);
 			/* V */
-			*framebuffer++ = 0x7F;
-			
+			*framebuffer++ = 0x80;
+
 			ptmp += 2;
 		}
 	}

guvcview-src-1.5.3.tar.gz/src/colorspaces.h -> guvcview-src-1.6.1.tar.gz/src/colorspaces.h Changed

guvcview-src-1.5.3.tar.gz/src/create_video.c -> guvcview-src-1.6.1.tar.gz/src/create_video.c Changed

@@ -21,8 +21,10 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gprintf.h>
 #include <pthread.h>
 #include <stdlib.h>
+#include <math.h>
 
 #include "../config.h"
 #include "defs.h"
@@ -44,6 +46,7 @@
 #define __AMUTEX &pdata->mutex
 #define __VMUTEX &videoIn->mutex
 #define __GMUTEX &global->mutex
+#define __FMUTEX &global->file_mutex
 #define __GCOND  &global->IO_cond
 
 /*video capture can only start after buffer allocation*/
@@ -54,7 +57,7 @@
 	int framesize = global->height*global->width*2; /*yuyv (maximum size)*/
 	if((global->fps > 0) && (global->fps_num > 0))
 	    global->video_buff_size = (global->fps * 3) / (global->fps_num * 2); /* 1,5 seconds of video in buffer*/
-	if (global->video_buff_size < 2) global->video_buff_size = 2; /*keep at least two frames*/
+	if (global->video_buff_size < 16) global->video_buff_size = 16; /*keep at least 16 frames*/
 	
 	/*alloc video ring buffer*/
 	__LOCK_MUTEX(__GMUTEX);
@@ -65,6 +68,7 @@
 			for(i=0;i<global->video_buff_size;i++)
 			{
 				global->videoBuffi.frame = g_new0(BYTE,framesize);
+				global->videoBuffi.used = FALSE;
 			}
 		}
 		else
@@ -82,6 +86,7 @@
 			for(i=0;i<global->video_buff_size;i++)
 			{
 				global->videoBuffi.frame = g_new0(BYTE,framesize);
+				global->videoBuffi.used = FALSE;
 			}
 		}
 		//reset indexes
@@ -90,9 +95,8 @@
 	__UNLOCK_MUTEX(__GMUTEX);
 }
 
-static int initVideoFile(struct ALL_DATA *all_data, void * lavc_aud_data)
+static int initVideoFile(struct ALL_DATA *all_data)
 {
-	struct lavcAData** lavc_audio_data = (struct lavcAData**) lavc_aud_data;
 	struct GWIDGET *gwidget = all_data->gwidget;
 	struct paRecordData *pdata = all_data->pdata;
 	struct GLOBAL *global = all_data->global;
@@ -148,7 +152,7 @@
 				if(global->Sound_enable > 0) 
 				{
 					/*get channels and sample rate*/
-					set_sound(global, pdata, (void *) lavc_audio_data);
+					set_sound(global, pdata);
 					/*set audio header for avi*/
 					AVI_set_audio(videoF->AviOut, global->Sound_NumChan, 
 						global->Sound_SampRate,
@@ -158,7 +162,7 @@
 					/* Initialize sound (open stream)*/
 					if(init_sound (pdata)) 
 					{
-						g_printerr("error opening portaudio\n");
+						g_printerr("Audio initialization error\n");
 						global->Sound_enable=0;
 						if(!(global->no_display))
                         {
@@ -178,7 +182,7 @@
 			if(global->Sound_enable > 0) 
 			{
 				/*set channels, sample rate and allocate buffers*/
-				set_sound(global, pdata, (void *) lavc_audio_data);
+				set_sound(global, pdata);
 			}
 			if(init_FormatContext((void *) all_data)<0)
 			{
@@ -208,7 +212,7 @@
 				/* Initialize sound (open stream)*/
 				if(init_sound (pdata)) 
 				{
-					g_printerr("error opening portaudio\n");
+					g_printerr("Audio initialization error\n");
 					global->Sound_enable=0;
 					if(!(global->no_display))
                     {
@@ -410,7 +414,7 @@
 	return (0);
 }
 
-static int write_audio_frame (struct ALL_DATA *all_data, void *lavc_adata, AudBuff *proc_buff)
+static int write_audio_frame (struct ALL_DATA *all_data)
 {
 	struct paRecordData *pdata = all_data->pdata;
 	struct GLOBAL *global = all_data->global;
@@ -424,7 +428,7 @@
 	{
 		case AVI_FORMAT:
 			if(!(global->VidButtPress)) //if this is set AVI reached it's limit size
-				ret = compress_audio_frame(all_data, lavc_adata, proc_buff);
+				ret = compress_audio_frame(all_data);
 		
 			if (ret) 
 			{	
@@ -467,9 +471,9 @@
 		case MKV_FORMAT:
 			__LOCK_MUTEX( __AMUTEX ); //why do we need this ???
 				/*set pts*/
-				videoF->apts = proc_buff->time_stamp;
+				videoF->apts = pdata->audio_buffpdata->br_indpdata->r_ind.time_stamp;
 				/*write audio chunk*/
-				ret = compress_audio_frame(all_data, lavc_adata, proc_buff);
+				ret = compress_audio_frame(all_data);
 			__UNLOCK_MUTEX( __AMUTEX );
 			break;
 			
@@ -534,49 +538,97 @@
 {
 	int diff_ind = 0;
 	int sched_sleep = 0;
-	//try to balance buffer overrun in read/write operations 
+	/* try to balance buffer overrun in read/write operations */
 	if(w_ind >= r_ind)
 		diff_ind = w_ind - r_ind;
 	else
 		diff_ind = (buff_size - r_ind) + w_ind;
-
-	if(diff_ind <= 15) sched_sleep = 0; /* full throttle (must wait for audio at least 10 frames) */
-	else if (diff_ind <= 20) sched_sleep = (diff_ind-15) * 2; /* <= 10  ms ~1 frame @ 90  fps */
-	else if (diff_ind <= 25) sched_sleep = (diff_ind-15) * 3; /* <= 30  ms ~1 frame @ 30  fps */
-	else if (diff_ind <= 30) sched_sleep = (diff_ind-15) * 4; /* <= 60  ms ~1 frame @ 15  fps */
-	else if (diff_ind <= 35) sched_sleep = (diff_ind-15) * 5; /* <= 100 ms ~1 frame @ 10  fps */
-	else if (diff_ind <= 40) sched_sleep = (diff_ind-15) * 6; /* <= 130 ms ~1 frame @ 7,5 fps */
-	else sched_sleep = (diff_ind-15) * 7;                     /* <= 210 ms ~1 frame @ 5   fps */
 	
+	int th = (int) lround((double) buff_size * 0.7);
+	
+	if(diff_ind <= th) /* from 0 to 50 ms (down below 20 fps)*/
+		sched_sleep = (int) lround((double) (diff_ind * 71) / buff_size);
+	else               /*from 50 to 210 ms (down below 5 fps)*/
+		sched_sleep = (int) lround((double) ((diff_ind * 320) / buff_size) - 110);
+	
+	if(sched_sleep < 0) sched_sleep = 0; /*clip to positive values just in case*/
+	
+	//g_printf("diff index: %i sleep %i\n",diff_ind, sched_sleep);
 	return sched_sleep;
 }
 
-static void process_audio(struct ALL_DATA *all_data, 
-			AudBuff *aud_proc_buff,
-			void *lavc_adata, 
+static int get_audio_flag(struct paRecordData *pdata)
+{
+	int flag = 0;
+	__LOCK_MUTEX(__AMUTEX);
+		flag = pdata->audio_buff_flagpdata->br_ind;
+	__UNLOCK_MUTEX(__AMUTEX);
+	return flag;
+}
+
+static gboolean is_audio_processing(struct paRecordData *pdata, gboolean set_processing)
+{
+	int flag = get_audio_flag(pdata);
+	
+	if((set_processing) && (flag == AUD_PROCESS))
+	{
+		__LOCK_MUTEX(__AMUTEX);
+			pdata->audio_buff_flagpdata->br_ind = AUD_PROCESSING;
+		__UNLOCK_MUTEX(__AMUTEX);
+		
+		flag = AUD_PROCESSING;
+	}	
+	
+	if(flag == AUD_PROCESSING)
+		return TRUE;
+	else
+		return FALSE;
+}
+
+//static gboolean is_audioTS_lessThan_videoTS(void *data)
+//{
+//	struct ALL_DATA *all_data = (struct ALL_DATA *) data;
+//	struct paRecordData *pdata = all_data->pdata;
+//	struct GLOBAL *global = all_data->global;
+//
+//	__LOCK_MUTEX(__AMUTEX);
+//		QWORD audioTS = pdata->audio_buffpdata->br_indpdata->r_ind.time_stamp;
+//	__UNLOCK_MUTEX(__AMUTEX);
+//	
+//	__LOCK_MUTEX( __GMUTEX );
+//		QWORD videoTS = global->videoBuffglobal->r_ind.time_stamp;
+//	__UNLOCK_MUTEX( __GMUTEX );
+//	
+//	if (audioTS < videoTS)
+//		return TRUE;
+//	else
+//		return FALSE;
+//}
+
+static gboolean process_audio(struct ALL_DATA *all_data,  
 			struct audio_effects **aud_eff)
 {
+	struct vdIn *videoIn = all_data->videoIn;
 	struct paRecordData *pdata = all_data->pdata;
-
-	__LOCK_MUTEX( __AMUTEX );
-		gboolean used = pdata->audio_buffpdata->r_ind.used;
-	__UNLOCK_MUTEX( __AMUTEX );
-  
-	/*read at most 10 audio Frames (1152 * channels  samples each)*/
-	if(used)
+	
+	__LOCK_MUTEX(__VMUTEX);
+		gboolean capVid = videoIn->capVid;
+	__UNLOCK_MUTEX(__VMUTEX);
+	
+	/*read audio Frames (1152 * channels  samples each)*/
+	
+	gboolean finish = FALSE;
+	
+	/*used - doesn't need locking as current buffer must be on AUD_PROCESSING state*/
+	if(is_audio_processing(pdata, TRUE) &&
+		pdata->audio_buffpdata->br_indpdata->r_ind.used)
 	{
-		__LOCK_MUTEX( __AMUTEX );
-			memcpy(aud_proc_buff->frame, pdata->audio_buffpdata->r_ind.frame, pdata->aud_numSamples*sizeof(SAMPLE));
-			pdata->audio_buffpdata->r_ind.used = FALSE;
-			aud_proc_buff->time_stamp = pdata->audio_buffpdata->r_ind.time_stamp;
-			NEXT_IND(pdata->r_ind, AUDBUFF_SIZE);	
-		__UNLOCK_MUTEX( __AMUTEX ); /*now we should be able to unlock the audio mutex*/	
-		sync_audio_frame(all_data, aud_proc_buff);	
+		sync_audio_frame(all_data, &pdata->audio_buffpdata->br_indpdata->r_ind);	
 		/*run effects on data*/
 		/*echo*/
 		if((pdata->snd_Flags & SND_ECHO)==SND_ECHO) 
 		{
-			Echo(pdata, aud_proc_buff, *aud_eff, 300, 0.5);
+			Echo(pdata, &pdata->audio_buffpdata->br_indpdata->r_ind, *aud_eff, 300, 0.5);
 		}
 		else
 		{
@@ -586,7 +638,7 @@
 		/*fuzz*/
 		if((pdata->snd_Flags & SND_FUZZ)==SND_FUZZ) 
 		{
-			Fuzz(pdata, aud_proc_buff, *aud_eff);
+			Fuzz(pdata, &pdata->audio_buffpdata->br_indpdata->r_ind, *aud_eff);
 		}
 		else
 		{
@@ -596,7 +648,7 @@
 		/*reverb*/
 		if((pdata->snd_Flags & SND_REVERB)==SND_REVERB) 
 		{
-			Reverb(pdata, aud_proc_buff, *aud_eff, 50);
+			Reverb(pdata, &pdata->audio_buffpdata->br_indpdata->r_ind, *aud_eff, 50);
 		}
 		else
 		{
@@ -605,7 +657,7 @@
 		/*wahwah*/
 		if((pdata->snd_Flags & SND_WAHWAH)==SND_WAHWAH) 
 		{
-			WahWah (pdata, aud_proc_buff, *aud_eff, 1.5, 0, 0.7, 0.3, 2.5);
+			WahWah (pdata, &pdata->audio_buffpdata->br_indpdata->r_ind, *aud_eff, 1.5, 0, 0.7, 0.3, 2.5);
 		}
 		else
 		{
@@ -615,15 +667,43 @@
 		/*Ducky*/
 		if((pdata->snd_Flags & SND_DUCKY)==SND_DUCKY) 
 		{
-			change_pitch(pdata, aud_proc_buff, *aud_eff, 2);
+			change_pitch(pdata, &pdata->audio_buffpdata->br_indpdata->r_ind, *aud_eff, 2);
 		}
 		else
 		{
 			close_pitch (*aud_eff);
 		}
 			
-		write_audio_frame(all_data, lavc_adata, aud_proc_buff);
+		write_audio_frame(all_data);
+		
+		pdata->audio_buffpdata->br_indpdata->r_ind.used = FALSE;
+		NEXT_IND(pdata->r_ind, AUDBUFF_SIZE);
+		
+		/*start of new buffer block*/
+		if(pdata->r_ind == 0)
+		{
+			__LOCK_MUTEX(__AMUTEX);
+				pdata->audio_buff_flagpdata->br_ind = AUD_READY; 
+				NEXT_IND(pdata->br_ind, AUDBUFF_NUM);
+			__UNLOCK_MUTEX(__AMUTEX);
+		}
+		
+	}
+	else
+	{
+		if (capVid)
+		{
+			/*video buffer underrun            */
+			/*wait for next frame (sleep 10 ms)*/
+			sleep_ms(10);
+		}
+		else 
+		{
+			finish = TRUE; /*all frames processed and no longer capturing so finish*/
+		}
 	}
+	
+	return finish;
 }
 
 static gboolean process_video(struct ALL_DATA *all_data, 
@@ -652,6 +732,7 @@
 	__LOCK_MUTEX(__GMUTEX);
     	gboolean used = global->videoBuffglobal->r_ind.used;
     __UNLOCK_MUTEX(__GMUTEX);
+	
 	if (used)
 	{
 		__LOCK_MUTEX(__GMUTEX);
@@ -726,10 +807,15 @@
 			/*wait for next frame (sleep 10 ms)*/
 			sleep_ms(10);
 		}
-		else 
+		else if (*lavc_data != NULL) //if we are using a lavc encoder flush the last frames
 		{
-			finish = TRUE; /*all frames processed and no longer capturing so finish*/
+			//flush video encoder
+			(*lavc_data)->flush_delayed_frames = 1;
+			write_video_frame(all_data, (void *) jpeg_struct, (void *) lavc_data, proc_buff);
+			finish = (*lavc_data)->flush_done; /*all frames processed and no longer capturing so finish*/
 		}
+		else //finish
+			finish = TRUE;
 	}
 	return finish;
 }
@@ -774,6 +860,9 @@
 	global->videoBuffglobal->w_ind.used = TRUE;
 }
 
+/* called from main video loop*
+ * stores current frame in video ring buffer
+ */
 int store_video_frame(void *data)
 {
 	struct ALL_DATA *all_data = (struct ALL_DATA *) data;
@@ -810,7 +899,7 @@
 			if (!global->videoBuffglobal->w_ind.used)
 			{
 				store_at_index(data);
-                producer_sleep = buff_scheduler(global->w_ind, global->r_ind, global->video_buff_size);
+                		producer_sleep = buff_scheduler(global->w_ind, global->r_ind, global->video_buff_size);
 				NEXT_IND(global->w_ind, global->video_buff_size);
 			}
 			else ret = -2;/*drop frame*/
@@ -828,37 +917,74 @@
 	return ret;
 }
 
+void *Audio_loop(void *data)
+{
+	struct ALL_DATA *all_data = (struct ALL_DATA *) data;
+	struct GLOBAL *global = all_data->global;
+	struct paRecordData *pdata = all_data->pdata;
+	struct vdIn *videoIn = all_data->videoIn;
+
+	struct audio_effects *aud_eff = init_audio_effects ();
+	global->av_drift = 0;
+	pdata->ts_drift = 0;
+	
+	gboolean capVid = TRUE;
+	gboolean finished = FALSE;
+	int max_loops = 60;
+	
+	while(!finished)
+	{
+		__LOCK_MUTEX(__VMUTEX);
+			capVid = videoIn->capVid;
+		__UNLOCK_MUTEX(__VMUTEX);
+			
+		finished = process_audio(all_data, &(aud_eff));
+		
+		if(!capVid)
+		{
+			/* if capture has stopped then limit the number of iterations
+			 * fixes any possible loop lock on process_audio
+			 */
+			max_loops--;
+			if(max_loops < 1)
+				finished = TRUE;
+		}
+	}
+
+	close_audio_effects (aud_eff);
+	
+	return ((void *) 0);
+}
+
 void *IO_loop(void *data)
 {
 	struct ALL_DATA *all_data = (struct ALL_DATA *) data;
 	
 	struct GWIDGET *gwidget = all_data->gwidget;
-	struct paRecordData *pdata = all_data->pdata;
 	struct GLOBAL *global = all_data->global;
+	
 	struct vdIn *videoIn = all_data->videoIn;
 
 	struct JPEG_ENCODER_STRUCTURE *jpg_data=NULL;
 	struct lavcData *lavc_data = NULL;
-	struct lavcAData *lavc_audio_data = NULL;
-	struct audio_effects *aud_eff = NULL;
+	//struct audio_effects *aud_eff = NULL;
 	
+	gboolean capVid = TRUE;
 	gboolean finished=FALSE;
+	int max_loops = 60;
+	
 	__LOCK_MUTEX(__VMUTEX);
 		videoIn->IOfinished=FALSE;
 	__UNLOCK_MUTEX(__VMUTEX);
-	
-	gboolean capVid=FALSE;
     
 	gboolean failed = FALSE;
-	int proc_flag = 0;
-	int diff_ind=0;
+	gboolean audio_failed = FALSE;
 	
-	//buffers to be processed (video and audio)
+	//video buffers to be processed
 	int frame_size=0;
 	VidBuff *proc_buff = NULL;
-	AudBuff *aud_proc_buff = NULL;
 	
-	if(initVideoFile(all_data, (void *) &(lavc_audio_data))<0)
+	if(initVideoFile(all_data)<0)
 	{
 		g_printerr("Cap Video failed\n");
 		if(!(global->no_display))
@@ -888,101 +1014,52 @@
 		proc_buff->frame = g_new0(BYTE, frame_size);
 	
 		if (global->Sound_enable) 
-		{
-			aud_eff=init_audio_effects ();
-			aud_proc_buff = g_new0(AudBuff, 1);
-			aud_proc_buff->frame = g_new0(SAMPLE, pdata->aud_numSamples);
-			global->av_drift = 0;
-			pdata->ts_drift = 0;
+		{	
+			/*start audio process thread*/
+			if( __THREAD_CREATE(&all_data->audio_thread, Audio_loop, (void *) all_data))
+			{
+				g_printerr("Audio thread creation failed\n");
+				audio_failed = TRUE;
+			}
 		}
 	}
 	
+	/*process video frames*/
 	if(!failed)
 	{
 		while(!finished)
 		{
-			if(global->Sound_enable)
-			{
-				__LOCK_MUTEX(__VMUTEX);
-					capVid = videoIn->capVid;
-				__UNLOCK_MUTEX(__VMUTEX);
-
-				__LOCK_MUTEX( __AMUTEX );
-				__LOCK_MUTEX( __GMUTEX );
-					//check read/write index delta in frames 
-					if(global->w_ind >= global->r_ind)
-						diff_ind = global->w_ind - global->r_ind;
-					else
-						diff_ind = (global->video_buff_size - global->r_ind) + global->w_ind;
-			
-					if( (pdata->audio_buffpdata->r_ind.used && global->videoBuffglobal->r_ind.used) &&
-						(pdata->audio_buffpdata->r_ind.time_stamp < global->videoBuffglobal->r_ind.time_stamp))
-					{
-						proc_flag = 1;	//process audio
-					}
-					else if(pdata->audio_buffpdata->r_ind.used && global->videoBuffglobal->r_ind.used)
-					{
-						proc_flag = 2;    //process video
-					}
-					else if (diff_ind < 10 && capVid)
-					{
-						proc_flag = 3;	//sleep -wait for audio (at most 10 video frames)
-					}
-					else if(pdata->audio_buffpdata->r_ind.used)
-					{	
-						proc_flag = 1;    //process audio
-					}
-					else proc_flag = 2;    //process video
-				__UNLOCK_MUTEX( __GMUTEX );
-				__UNLOCK_MUTEX( __AMUTEX );
-			
+		
+			__LOCK_MUTEX(__VMUTEX);
+				capVid = videoIn->capVid;
+			__UNLOCK_MUTEX(__VMUTEX);
+	
+			finished = process_video (all_data, proc_buff, &(lavc_data), &(jpg_data));
 			
-				switch(proc_flag)
-				{
-					case 1:
-						//g_print("processing audio frame\n");
-						process_audio(all_data, aud_proc_buff, (void *) &lavc_audio_data, &(aud_eff));
-						break;
-					case 2:
-						//g_print("processing video frame\n");
-						finished = process_video (all_data, proc_buff, &(lavc_data), &(jpg_data));
-						break;
-					default:
-						sleep_ms(10); /*make the thread sleep for 10ms*/
-						break;
-				}
-			}
-			else
+			if(!capVid)
 			{
-				//process video
-				finished = process_video (all_data, proc_buff, &(lavc_data), &(jpg_data));
+				/* if capture has stopped then limit the number of iterations
+				 * fixes any possible loop lock on process_video 
+				 */
+				max_loops--;
+				if(max_loops < 1)
+					finished = TRUE;
 			}
+		}
 		
-			if(finished)
-			{
-				//wait for audio to finish
-				int stall = wait_ms(&(pdata->streaming), FALSE, __AMUTEX, 10, 25);
-				if( !(stall > 0) )
-				{
-					g_printerr("audio streaming stalled - timeout\n");
-				}
-				//process any remaining audio
-				if(global->Sound_enable) process_audio(all_data, aud_proc_buff,(void *) &lavc_audio_data, &(aud_eff));
-			}
+		if (global->Sound_enable && !audio_failed) 
+		{
+			/* join audio thread*/
+			__THREAD_JOIN( all_data->audio_thread );
 		}
-	
+		
 		/*finish capture*/
 		closeVideoFile(all_data);
 	
 		/*free proc buffer*/
 		g_free(proc_buff->frame);
 		g_free(proc_buff);
-		if(aud_proc_buff) 
-		{
-			g_free(aud_proc_buff->frame);
-			g_free(aud_proc_buff);
-		}
-		if (global->Sound_enable) close_audio_effects (aud_eff);
+		//if (global->Sound_enable) close_audio_effects (aud_eff);
 	}
 	
 	if(lavc_data != NULL)
@@ -990,11 +1067,7 @@
 		clean_lavc(&lavc_data);
 		lavc_data = NULL;
 	}
-	if(lavc_audio_data != NULL)
-	{
-		clean_lavc_audio(&lavc_audio_data);
-		lavc_audio_data = NULL;
-	}
+	
 	if(jpg_data != NULL) g_free(jpg_data);
 	jpg_data = NULL;

guvcview-src-1.5.3.tar.gz/src/defs.h -> guvcview-src-1.6.1.tar.gz/src/defs.h Changed

guvcview-src-1.5.3.tar.gz/src/globals.c -> guvcview-src-1.6.1.tar.gz/src/globals.c Changed

guvcview-src-1.5.3.tar.gz/src/globals.h -> guvcview-src-1.6.1.tar.gz/src/globals.h Changed

guvcview-src-1.5.3.tar.gz/src/guvcview.c -> guvcview-src-1.6.1.tar.gz/src/guvcview.c Changed

guvcview-src-1.5.3.tar.gz/src/guvcview.h -> guvcview-src-1.6.1.tar.gz/src/guvcview.h Changed

guvcview-src-1.5.3.tar.gz/src/lavc_common.c -> guvcview-src-1.6.1.tar.gz/src/lavc_common.c Changed

@@ -128,15 +128,99 @@
 	//videoF->frame_number++;
 	
 	if(!data->monotonic_pts) //generate a real pts based on the frame timestamp
-		data->picture->pts += ((videoF->apts - videoF->old_apts)/1000) * 90;
+		data->picture->pts += ((videoF->vpts - videoF->old_vpts)/1000) * 90;
 	else  //generate a true monotonic pts based on the codec fps
 		data->picture->pts += (data->codec_context->time_base.num*1000/data->codec_context->time_base.den) * 90;
 	
-	out_size = avcodec_encode_video(data->codec_context, data->outbuf, data->outbuf_size, data->picture);
+	videoF->old_vpts = videoF->vpts;
+	
+	if(data->flush_delayed_frames)
+	{
+		//pkt.size = 0;
+		if(!data->flushed_buffers)
+		{
+			avcodec_flush_buffers(data->codec_context);
+			data->flushed_buffers = 1;
+		}
+			
+ 	}
+ 		
+#if LIBAVCODEC_VER_AT_LEAST(54,01)
+	AVPacket pkt;
+    int got_packet = 0;
+    av_init_packet(&pkt);
+	pkt.data = data->outbuf;
+	pkt.size = data->outbuf_size;
+	
+    //if(data->outbuf_size < FF_MIN_BUFFER_SIZE)
+    //{
+	//	av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n");
+    //    return -1;
+    //}
+ 	int ret = 0;
+ 	if(!data->flush_delayed_frames)
+    	ret = avcodec_encode_video2(data->codec_context, &pkt, data->picture, &got_packet);
+   	else
+   		ret = avcodec_encode_video2(data->codec_context, &pkt, NULL, &got_packet);
+    
+    if (!ret && got_packet && data->codec_context->coded_frame) 
+    {
+    	data->codec_context->coded_frame->pts       = pkt.pts;
+        data->codec_context->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY);
+    }
+ 
+    /* free any side data since we cannot return it */
+    if (pkt.side_data_elems > 0) 
+    {
+    	int i;
+        for (i = 0; i < pkt.side_data_elems; i++)
+        	av_free(pkt.side_datai.data);
+        av_freep(&pkt.side_data);
+        pkt.side_data_elems = 0;
+    }
+ 
+    out_size = pkt.size;
+#else
+	if(!data->flush_delayed_frames)
+		out_size = avcodec_encode_video(data->codec_context, data->outbuf, data->outbuf_size, data->picture);
+	else
+		out_size = avcodec_encode_video(data->codec_context, data->outbuf, data->outbuf_size, NULL);
+#endif
+
+	 if(data->flush_delayed_frames && out_size == 0)
+    	data->flush_done = 1;
+	
+	if(out_size == 0 && data->index_of_df < 0)
+	{
+	    data->delayed_ptsdata->delayed_frames = videoF->vpts;
+	    data->delayed_frames++;
+	    if(data->delayed_frames > MAX_DELAYED_FRAMES)
+	    {
+	    	data->delayed_frames = MAX_DELAYED_FRAMES;
+	    	printf("WARNING: Maximum of %i delayed video frames reached...\n", MAX_DELAYED_FRAMES);
+	    }
+	}
+	else
+	{
+		if(data->delayed_frames > 0)
+		{
+			if(data->index_of_df < 0)
+			{
+				data->index_of_df = 0;
+				printf("WARNING: video codec is using %i delayed video frames\n", data->delayed_frames);
+			}
+			INT64 pts = videoF->vpts;
+			videoF->vpts = data->delayed_ptsdata->index_of_df;
+			data->delayed_ptsdata->index_of_df = pts;
+			data->index_of_df++;
+			if(data->index_of_df >= data->delayed_frames)
+				data->index_of_df = 0;
+		}
+	}	
 	return (out_size);
 }
 
-int encode_lavc_audio_frame (short *audio_buf, struct lavcAData* data, struct VideoFormatData *videoF)
+int encode_lavc_audio_frame (void *audio_buf, struct lavcAData* data, struct VideoFormatData *videoF)
 {
 	int out_size = 0;
 	
@@ -182,7 +266,11 @@
 	if(*data)
 	{
 		//enc_frames = (*data)->codec_context->real_pict_num;
-		avcodec_flush_buffers((*data)->codec_context);
+		if(!(*data)->flushed_buffers)
+		{
+			avcodec_flush_buffers((*data)->codec_context);
+			(*data)->flushed_buffers = 1;
+		}
 		//close codec 
 		avcodec_close((*data)->codec_context);
 #if LIBAVCODEC_VER_AT_LEAST(53,6)
@@ -338,62 +426,83 @@
 	//alloc tmpbuff (yuv420p)
 	data->tmpbuf = g_new0(BYTE, (width*height*3)/2);
 	//alloc outbuf
-	data->outbuf_size = 240000;
+	data->outbuf_size = 240000;//1792
 	data->outbuf = g_new0(BYTE, data->outbuf_size);
 	
+	data->delayed_frames = 0;
+	data->index_of_df = -1;
+	
+	data->flushed_buffers = 0;
+	data->flush_delayed_frames = 0;
+	data->flush_done = 0;
+	
 	return(data);
 }
 
 struct lavcAData* init_lavc_audio(struct paRecordData *pdata, int codec_ind)
 {
 	//allocate
-	struct lavcAData* data = g_new0(struct lavcAData, 1);
+	pdata->lavc_data = g_new0(struct lavcAData, 1);
 	
-	data->codec_context = NULL;
+	pdata->lavc_data->codec_context = NULL;
 	acodecs_data *defaults = get_aud_codec_defaults(codec_ind);
 
 	// find the audio encoder
-	data->codec = avcodec_find_encoder(defaults->codec_id);
-	if (!data->codec) 
+	pdata->lavc_data->codec = avcodec_find_encoder(defaults->codec_id);
+	if (!pdata->lavc_data->codec) 
 	{
 		fprintf(stderr, "ffmpeg audio codec not found\n");
 		return(NULL);
 	}
 	
 #if LIBAVCODEC_VER_AT_LEAST(53,6)	
-	data->codec_context = avcodec_alloc_context3(data->codec);
+	pdata->lavc_data->codec_context = avcodec_alloc_context3(pdata->lavc_data->codec);
 #else
-	data->codec_context = avcodec_alloc_context();
+	pdata->lavc_data->codec_context = avcodec_alloc_context();
 #endif
 
 	// define bit rate (lower = more compression but lower quality)
-	data->codec_context->bit_rate = defaults->bit_rate;
-	data->codec_context->profile = defaults->profile; /*for AAC*/
+	pdata->lavc_data->codec_context->bit_rate = defaults->bit_rate;
+	pdata->lavc_data->codec_context->profile = defaults->profile; /*for AAC*/
 	
-	data->codec_context->flags |= defaults->flags;
+	pdata->lavc_data->codec_context->flags |= defaults->flags;
 	
-	data->codec_context->sample_rate = pdata->samprate;
-	data->codec_context->channels = pdata->channels;
-	data->codec_context->cutoff = 0; /*automatic*/
-	/*libav 7.1 only seems to accept S16 format*/
+	pdata->lavc_data->codec_context->sample_rate = pdata->samprate;
+	pdata->lavc_data->codec_context->channels = pdata->channels;
 
-#if !LIBAVCODEC_VER_AT_LEAST(53,0)
-#define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16 
+#ifdef AV_CH_LAYOUT_MONO	
+	if(pdata->channels < 2)
+		pdata->lavc_data->codec_context->channel_layout = AV_CH_LAYOUT_MONO;
+	else
+		pdata->lavc_data->codec_context->channel_layout = AV_CH_LAYOUT_STEREO;
+#endif
+		
+	pdata->lavc_data->codec_context->cutoff = 0; /*automatic*/
+	/*
+	 * recent libav only seems to accept S16 format except for 
+	 * AC3 and AAC that must be float type 
+	 */
+#if !LIBAVCODEC_VER_AT_LEAST(54,01)
+	if(defaults->codec_id == CODEC_ID_AC3)
+#else
+	if(defaults->codec_id == CODEC_ID_AC3 || defaults->codec_id == CODEC_ID_AAC)
 #endif
-	data->codec_context->sample_fmt = AV_SAMPLE_FMT_S16; /* Int16 sample */
+		pdata->lavc_data->codec_context->sample_fmt = AV_SAMPLE_FMT_FLT; /* Float sample */
+	else
+		pdata->lavc_data->codec_context->sample_fmt = AV_SAMPLE_FMT_S16; /* Int16 sample */
 	
-    data->codec_context->codec_id = defaults->codec_id;
+    pdata->lavc_data->codec_context->codec_id = defaults->codec_id;
 	
 #if !LIBAVCODEC_VER_AT_LEAST(53,0)
 #define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
 #endif
-	data->codec_context->codec_type = AVMEDIA_TYPE_AUDIO;
+	pdata->lavc_data->codec_context->codec_type = AVMEDIA_TYPE_AUDIO;
 	
 	// open codec
 #if LIBAVCODEC_VER_AT_LEAST(53,6)
-	if (avcodec_open2(data->codec_context, data->codec, NULL) < 0)
+	if (avcodec_open2(pdata->lavc_data->codec_context, pdata->lavc_data->codec, NULL) < 0)
 #else
-	if (avcodec_open(data->codec_context, data->codec) < 0) 
+	if (avcodec_open(pdata->lavc_data->codec_context, pdata->lavc_data->codec) < 0) 
 #endif
 	{
 		fprintf(stderr, "could not open codec\n");
@@ -401,18 +510,18 @@
 	}
 	
 	/* the codec gives us the frame size, in samples */
-	int frame_size = data->codec_context->frame_size;  
+	int frame_size = pdata->lavc_data->codec_context->frame_size;  
 	g_print("Audio frame size is %d samples for selected codec\n", frame_size);
 	
-	data->monotonic_pts = defaults->monotonic_pts;
+	pdata->lavc_data->monotonic_pts = defaults->monotonic_pts;
 	
 	//alloc outbuf
-	data->outbuf_size = 240000;
-	data->outbuf = g_new0(BYTE, data->outbuf_size);
+	pdata->lavc_data->outbuf_size = pdata->outbuf_size;
+	pdata->lavc_data->outbuf = g_new0(BYTE, pdata->lavc_data->outbuf_size);
 	
 #if LIBAVCODEC_VER_AT_LEAST(53,34)	
-	data->frame= avcodec_alloc_frame();
-	avcodec_get_frame_defaults(data->frame);
+	pdata->lavc_data->frame= avcodec_alloc_frame();
+	avcodec_get_frame_defaults(pdata->lavc_data->frame);
 #endif
-	return(data);
+	return(pdata->lavc_data);
 }

guvcview-src-1.5.3.tar.gz/src/lavc_common.h -> guvcview-src-1.6.1.tar.gz/src/lavc_common.h Changed

@@ -31,14 +31,18 @@
 
 #ifdef HAS_AVCODEC_H
   #include <avcodec.h>
+  #include <audioconvert.h>
 #else
   #ifdef HAS_LIBAVCODEC_AVCODEC_H
     #include <libavcodec/avcodec.h>
+    #include <libavutil/audioconvert.h> //channel_layout definitions
   #else
     #ifdef HAS_FFMPEG_AVCODEC_H
       #include <ffmpeg/avcodec.h>
+      #include <ffmpeg/audioconvert.h>
     #else
       #include <libavcodec/avcodec.h>
+      #include <libavutil/audioconvert.h>
     #endif
   #endif
 #endif
@@ -46,15 +50,32 @@
 #define LIBAVCODEC_VER_AT_LEAST(major,minor)  (LIBAVCODEC_VERSION_MAJOR > major || \
                                               (LIBAVCODEC_VERSION_MAJOR == major && \
                                                LIBAVCODEC_VERSION_MINOR >= minor))
+                                               
+#if !LIBAVCODEC_VER_AT_LEAST(53,0)
+  #define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16
+  #define AV_SAMPLE_FMT_FLT SAMPLE_FMT_FLT 
+#endif
+
+#define MAX_DELAYED_FRAMES 50  //Maximum supported delayed frames
+
 /*video*/
 struct lavcData
 {
 	AVCodec *codec;
+#if LIBAVCODEC_VER_AT_LEAST(53,6)
 	AVDictionary *private_options;
+#endif
 	AVCodecContext *codec_context;
 	AVFrame *picture;
 	AVPacket *outpkt;
 	
+	int delayed_frames;
+	int index_of_df; //index of delayed frame pts in use;
+	INT64 delayed_ptsMAX_DELAYED_FRAMES; //delayed frames pts
+	int flush_delayed_frames;
+	int flushed_buffers;
+	int flush_done;
+	
 	BYTE* tmpbuf;
 	int outbuf_size;
 	BYTE* outbuf;
@@ -79,7 +100,7 @@
 
 int encode_lavc_frame (BYTE *picture_buf, struct lavcData* data, int format, struct VideoFormatData *videoF);
 
-int encode_lavc_audio_frame (short *audio_buf, struct lavcAData* data, struct VideoFormatData *videoF);
+int encode_lavc_audio_frame (void *audio_buf, struct lavcAData* data, struct VideoFormatData *videoF);
 
 /* arg = pointer to lavcData struct =>
  * *arg = struct lavcData**

guvcview-src-1.5.3.tar.gz/src/matroska.c -> guvcview-src-1.6.1.tar.gz/src/matroska.c Changed

guvcview-src-1.5.3.tar.gz/src/options.c -> guvcview-src-1.6.1.tar.gz/src/options.c Changed

@@ -27,6 +27,8 @@
 #include <glib/gprintf.h>
 /* support for internationalization - i18n */
 #include <glib/gi18n.h>
+/*needs locale.h when debug is enabled*/
+#include <locale.h>
 
 #include "defs.h"
 #include "globals.h"
@@ -72,7 +74,7 @@
 		g_fprintf(fp,"spinbehave=%i\n", global->spinbehave);
 		g_fprintf(fp,"#Default action. 0 for picture, 1 for video.\n");
 		g_fprintf(fp,"default_action=%i\n", global->default_action);
-		g_fprintf(fp,"# mode video format 'yuvy' 'yvyu' 'uyvy' 'yyuv' 'yu12' 'yv12' 'nv12' 'nv21' 'nv16' 'nv61' 'y41p' 'grey' 'y16 ' 's501' 's505' 's508' 'gbrg' 'grbg' 'ba81' 'rggb' 'rgb3' 'bgr3' 'jpeg' 'mjpg'(default)\n");
+		g_fprintf(fp,"# mode video format 'yuvy' 'yvyu' 'uyvy' 'yyuv' 'yu12' 'yv12' 'nv12' 'nv21' 'nv16' 'nv61' 'y41p' 'grey' 'y10b' 'y16 ' 's501' 's505' 's508' 'gbrg' 'grbg' 'ba81' 'rggb' 'rgb3' 'bgr3' 'jpeg' 'mjpg'(default)\n");
 		g_fprintf(fp,"mode='%s'\n",global->mode);
 		g_fprintf(fp,"# frames per sec. - hardware supported - default( %i )\n",DEFAULT_FPS);
 		g_fprintf(fp,"fps='%d/%d'\n",global->fps_num,global->fps);
@@ -504,8 +506,8 @@
 						else if (g_strcmp0(name,"image_inc")==0) 
 						{
 							global->image_inc = (DWORD) scanner->value.v_int;
-							if((global->image_timer > 0) && (global->image_inc <= 0))
-							    global->image_inc = 1;
+							//if((global->image_timer > 0) && (global->image_inc <= 0))
+							//    global->image_inc = 1;
 							g_snprintf(global->imageinc_str,20,_("File num:%d"),global->image_inc);
 						}
 						else if (g_strcmp0(name,"acodec_bit_rate")==0) 
@@ -767,7 +769,7 @@
 		{ "capture_method", 'r', 0, G_OPTION_ARG_INT, &cap_meth, N_("Capture method (1-mmap (default)  2-read)"), "1 | 2"},
 		{ "config", 'g', 0, G_OPTION_ARG_STRING, &config, N_("Configuration file"), "FILENAME" },
 		{ "hwd_acel", 'w', 0, G_OPTION_ARG_INT, &hwaccel, N_("Hardware accelaration (enable(1) | disable(0))"), "1 | 0" },
-		{ "format", 'f', 0, G_OPTION_ARG_STRING, &format, N_("Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"), "FORMAT" },
+		{ "format", 'f', 0, G_OPTION_ARG_STRING, &format, N_("Pixel format(mjpg|jpeg|yuyv|yvyu|uyvy|yyuv|yu12|yv12|nv12|nv21|nv16|nv61|y41p|grey|y10b|y16 |s501|s505|s508|gbrg|grbg|ba81|rggb|bgr3|rgb3)"), "FORMAT" },
 		{ "size", 's', 0, G_OPTION_ARG_STRING, &size, N_("Frame size, default: 640x480"), "WIDTHxHEIGHT"},
 		{ "image", 'i', 0, G_OPTION_ARG_STRING, &image, N_("Image File name"), "FILENAME"},
 		{ "cap_time", 'c', 0, G_OPTION_ARG_INT, &global->image_timer, N_("Image capture interval in seconds"), "TIME"},

guvcview-src-1.5.3.tar.gz/src/osd.c -> guvcview-src-1.6.1.tar.gz/src/osd.c Changed

guvcview-src-1.5.3.tar.gz/src/picture.c -> guvcview-src-1.6.1.tar.gz/src/picture.c Changed

guvcview-src-1.6.1.tar.gz/src/port_audio.c Added

@@ -0,0 +1,263 @@
+/*******************************************************************************#
+#           guvcview              http://guvcview.sourceforge.net               #
+#                                                                               #
+#           Paulo Assis <pj.assis@gmail.com>                                    #
+#                                                                               #
+# 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; either version 2 of the License, or             #
+# (at your option) any later version.                                           #
+#                                                                               #
+# This program is distributed in the hope that it will be useful,               #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of                #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 #
+# GNU General Public License for more details.                                  #
+#                                                                               #
+# You should have received a copy of the GNU General Public License             #
+# along with this program; if not, write to the Free Software                   #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA     #
+#                                                                               #
+********************************************************************************/
+
+#include <string.h>
+#include "port_audio.h"
+
+int
+portaudio_list_snd_devices(struct GLOBAL *global)
+{
+	int   it, numDevices, defaultDisplayed;
+	const PaDeviceInfo *deviceInfo;
+	
+	//reset device count
+	global->Sound_numInputDev = 0;
+	
+	numDevices = Pa_GetDeviceCount();
+	if( numDevices < 0 )
+	{
+		g_print( "SOUND DISABLE: Pa_CountDevices returned 0x%x\n", numDevices );
+		//err = numDevices;
+		global->Sound_enable=0;
+	} 
+	else 
+	{
+		global->Sound_DefDev = 0;
+			
+		for( it=0; it<numDevices; it++ )
+		{
+			deviceInfo = Pa_GetDeviceInfo( it );
+			if (global->debug) g_print( "--------------------------------------- device #%d\n", it );
+			// Mark global and API specific default devices
+			defaultDisplayed = 0;
+			
+			// with pulse, ALSA is now listed first and doesn't set a API default- 11-2009
+			if( it == Pa_GetDefaultInputDevice() )
+			{
+				if (global->debug) g_print( " Default Input" );
+				defaultDisplayed = 1;
+				global->Sound_DefDev=global->Sound_numInputDev;/*default index in array of input devs*/
+			}
+			else if( it == Pa_GetHostApiInfo( deviceInfo->hostApi )->defaultInputDevice )
+			{
+				const PaHostApiInfo *hostInfo = Pa_GetHostApiInfo( deviceInfo->hostApi );
+				if (global->debug) g_print( " Default %s Input", hostInfo->name );
+				defaultDisplayed = 2;
+				//global->Sound_DefDev=global->Sound_numInputDev;/*index in array of input devs*/
+			}
+			// OUTPUT device doesn't matter for capture
+			if( it == Pa_GetDefaultOutputDevice() )
+			{
+			 	if (global->debug) 
+				{
+					g_print( (defaultDisplayed ? "," : "") );
+					g_print( " Default Output" );
+				}
+				defaultDisplayed = 3;
+			}
+			else if( it == Pa_GetHostApiInfo( deviceInfo->hostApi )->defaultOutputDevice )
+			{
+				const PaHostApiInfo *hostInfo = Pa_GetHostApiInfo( deviceInfo->hostApi );
+				if (global->debug)
+				{
+					g_print( (defaultDisplayed ? "," : "") );                
+					g_print( " Default %s Output", hostInfo->name );/* OSS ALSA etc*/
+				}
+				defaultDisplayed = 4;
+			}
+
+			if( defaultDisplayed!=0 )
+				if (global->debug) g_print( " \n" );
+
+			/* print device info fields */
+			if (global->debug) 
+			{
+				g_print( "Name                     = %s\n", deviceInfo->name );
+				g_print( "Host API                 = %s\n",  Pa_GetHostApiInfo( deviceInfo->hostApi )->name );
+				g_print( "Max inputs = %d", deviceInfo->maxInputChannels  );
+			}
+			// INPUT devices (if it has input channels it's a capture device)
+			if (deviceInfo->maxInputChannels >0) 
+			{ 
+				global->Sound_numInputDev++;
+				//allocate new Sound Device Info
+				global->Sound_IndexDev = g_renew(sndDev, global->Sound_IndexDev, global->Sound_numInputDev);
+				//fill structure with sound data
+				global->Sound_IndexDevglobal->Sound_numInputDev-1.id=it; /*saves dev id*/
+				strncpy(global->Sound_IndexDevglobal->Sound_numInputDev-1.name, deviceInfo->name, 511);
+				strncpy(global->Sound_IndexDevglobal->Sound_numInputDev-1.description, deviceInfo->name, 255);
+				global->Sound_IndexDevglobal->Sound_numInputDev-1.chan=deviceInfo->maxInputChannels;
+				global->Sound_IndexDevglobal->Sound_numInputDev-1.samprate=deviceInfo->defaultSampleRate;
+				//Sound_IndexDevSound_numInputDev.Hlatency=deviceInfo->defaultHighInputLatency;
+				//Sound_IndexDevSound_numInputDev.Llatency=deviceInfo->defaultLowInputLatency;
+			}
+			if (global->debug) 
+			{
+				g_print( ", Max outputs = %d\n", deviceInfo->maxOutputChannels  );
+				g_print( "Def. low input latency   = %8.3f\n", deviceInfo->defaultLowInputLatency  );
+				g_print( "Def. low output latency  = %8.3f\n", deviceInfo->defaultLowOutputLatency  );
+				g_print( "Def. high input latency  = %8.3f\n", deviceInfo->defaultHighInputLatency  );
+				g_print( "Def. high output latency = %8.3f\n", deviceInfo->defaultHighOutputLatency  );
+				g_print( "Def. sample rate         = %8.2f\n", deviceInfo->defaultSampleRate );
+			}
+			
+		}
+		
+		if (global->debug) g_print("----------------------------------------------\n");
+	}
+	
+	return 0;
+}
+
+/*--------------------------- audio record callback -----------------------*/
+static int 
+recordCallback (const void *inputBuffer, void *outputBuffer,
+	unsigned long framesPerBuffer,
+	const PaStreamCallbackTimeInfo* timeInfo,
+	PaStreamCallbackFlags statusFlags,
+	void *userData )
+{
+	struct paRecordData *pdata = (struct paRecordData*)userData;
+	
+	int channels = pdata->channels;
+	
+	unsigned long numSamples = framesPerBuffer * channels;
+	
+	int res = record_sound ( inputBuffer, numSamples, userData );
+
+	if(res < 0 ) 
+		return (paComplete); /*capture stopped*/
+	else 
+		return (paContinue); /*still capturing*/
+}
+
+/*--------------------------- API initialization -------------------------*/
+int
+port_init_audio(struct paRecordData* pdata)
+{
+	PaError err = paNoError;
+	PaStream *stream = NULL;
+	
+	PaStreamParameters inputParameters;
+	
+	if(stream)
+	{
+		if( !(Pa_IsStreamStopped( stream )))
+		{
+			Pa_AbortStream( pdata->stream );
+			Pa_CloseStream( pdata->stream );
+			pdata->stream = NULL;
+		}
+	}
+	
+	inputParameters.device = pdata->device_id;
+	inputParameters.channelCount = pdata->channels;
+	inputParameters.sampleFormat = PA_SAMPLE_TYPE;
+	
+	if (Pa_GetDeviceInfo( inputParameters.device ))
+		inputParameters.suggestedLatency = Pa_GetDeviceInfo( inputParameters.device )->defaultHighInputLatency;
+	else
+		inputParameters.suggestedLatency = DEFAULT_LATENCY_DURATION/1000.0;
+	inputParameters.hostApiSpecificStreamInfo = NULL; 
+	
+	/*---------------------------- start recording Audio. ----------------------------- */
+	
+	err = Pa_OpenStream(
+		&stream,
+		&inputParameters,
+		NULL,                  /* &outputParameters, */
+		pdata->samprate,        /* sample rate        */
+		MPG_NUM_SAMP,          /* buffer in frames => Mpeg frame size (samples = 1152 samples * channels)*/
+		paNoFlag,              /* PaNoFlag - clip and dhiter*/
+		recordCallback,        /* sound callback     */
+		pdata );                /* callback userData  */
+	
+	if( err != paNoError ) goto error;
+	
+	err = Pa_StartStream( stream );
+	pdata->stream = (void *) stream; //store stream pointer
+	
+	if( err != paNoError ) goto error; /*should close the stream if error ?*/
+	
+	return 0;
+	
+error:
+	g_printerr("An error occured while starting the audio API\n" );
+	g_printerr("Error number: %d\n", err );
+	g_printerr("Error message: %s\n", Pa_GetErrorText( err ) );
+	pdata->streaming=FALSE;
+	
+	if(stream) Pa_AbortStream( stream );
+	
+	/*lavc is allways checked and cleaned when finishing worker thread*/
+	return(-1);
+}
+
+int
+port_close_audio (struct paRecordData *pdata)
+{
+	PaError err = paNoError;
+	PaStream *stream = (PaStream *) pdata->stream;
+	int ret = 0;
+	
+	/*stops and closes the audio stream*/
+	if(stream)
+	{
+		if(Pa_IsStreamActive( stream ) > 0)
+		{
+			g_print("Aborting audio stream\n");
+			err = Pa_AbortStream( stream );
+		}
+		else
+		{
+			g_print("Stoping audio stream\n");
+			err = Pa_StopStream( stream );
+		}
+		
+		if( err != paNoError )
+		{
+			g_printerr("An error occured while stoping the audio stream\n" );
+			g_printerr("Error number: %d\n", err );
+			g_printerr("Error message: %s\n", Pa_GetErrorText( err ) );
+			ret = -1;
+		}
+		
+		g_print("Closing audio stream...\n");
+		err = Pa_CloseStream( stream );
+		
+		if( err != paNoError )
+		{	
+			g_printerr("An error occured while closing the audio stream\n" );
+			g_printerr("Error number: %d\n", err );
+			g_printerr("Error message: %s\n", Pa_GetErrorText( err ) );
+			ret = -1;
+		}
+	}
+	else
+		g_print("Invalid stream pointer.\n");
+	
+	
+	pdata->stream = NULL;
+	
+	return (ret);
+} 
+
+

guvcview-src-1.6.1.tar.gz/src/port_audio.h Added

@@ -0,0 +1,54 @@
+/*******************************************************************************#
+#           guvcview              http://guvcview.sourceforge.net               #
+#                                                                               #
+#           Paulo Assis <pj.assis@gmail.com>                                    #
+#                                                                               #
+# 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; either version 2 of the License, or             #
+# (at your option) any later version.                                           #
+#                                                                               #
+# This program is distributed in the hope that it will be useful,               #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of                #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 #
+# GNU General Public License for more details.                                  #
+#                                                                               #
+# You should have received a copy of the GNU General Public License             #
+# along with this program; if not, write to the Free Software                   #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA     #
+#                                                                               #
+********************************************************************************/
+
+#ifndef PORT_AUDIO_H
+#define PORT_AUDIO_H
+
+#include <portaudio.h>
+#include "guvcview.h"
+#include "sound.h"
+
+/*------------- portaudio defs ----------------*/
+/*---- can be override in rc file or GUI ------*/
+
+#define DEFAULT_LATENCY_DURATION 100.0
+#define DEFAULT_LATENCY_CORRECTION -130.0
+
+#define SAMPLE_RATE  (0) /* 0 device default*/
+//#define FRAMES_PER_BUFFER (4096)
+
+/* sound can go for more 1 seconds than video          */
+
+#define NUM_CHANNELS    (0) /* 0-device default 1-mono 2-stereo */
+
+#define PA_SAMPLE_TYPE     paFloat32
+#define PA_FOURCC          WAVE_FORMAT_PCM //use PCM 16 bits converted from float
+
+int
+portaudio_list_snd_devices(struct GLOBAL *global);
+
+int
+port_init_audio(struct paRecordData* pdata);
+
+int
+port_close_audio(struct paRecordData *pdata);
+
+#endif
\ No newline at end of file

guvcview-src-1.5.3.tar.gz/src/profile.c -> guvcview-src-1.6.1.tar.gz/src/profile.c Changed

guvcview-src-1.5.3.tar.gz/src/pulse_audio.c -> guvcview-src-1.6.1.tar.gz/src/pulse_audio.c Changed

@@ -24,110 +24,461 @@
 
 #include <glib.h>
 #include <string.h>
+#include "pulse_audio.h"
 #include "audio_effects.h"
 #include "ms_time.h"
 
 #include <errno.h>
 
-#define __AMUTEX &pdata->mutex
+static int latency = 20000; // start latency in micro seconds
+static int underflows = 0;
+static int sink_index = 0;
+static int source_index = 0;
 
-//run in separate thread
-static void* pulse_read_audio(void *userdata) 
+static void 
+finish(pa_context *pa_ctx, pa_mainloop *pa_ml)
 {
-	int error;
+	/* clean up and disconnect */
+	pa_context_disconnect(pa_ctx);
+	pa_context_unref(pa_ctx);
+	pa_mainloop_free(pa_ml);
+}
+
+/* This callback gets called when our context changes state.  We really only
+ * care about when it's ready or if it has failed
+ */
+void 
+pa_state_cb(pa_context *c, void *userdata) 
+{
+	pa_context_state_t state;
+	int *pa_ready = userdata;
+	state = pa_context_get_state(c);
+	switch  (state) 
+	{
+		// These are just here for reference
+		case PA_CONTEXT_UNCONNECTED:
+		case PA_CONTEXT_CONNECTING:
+		case PA_CONTEXT_AUTHORIZING:
+		case PA_CONTEXT_SETTING_NAME:
+		default:
+			break;
+		case PA_CONTEXT_FAILED:
+		case PA_CONTEXT_TERMINATED:
+			*pa_ready = 2;
+			break;
+		case PA_CONTEXT_READY:
+			*pa_ready = 1;
+			break;
+	}
+}
+
+/*
+ * pa_mainloop will call this function when it's ready to tell us about a sink.
+ * Since we're not threading when listing devices, there's no need for mutexes 
+ * on the devicelist structure
+ */
+void pa_sourcelist_cb(pa_context *c, const pa_source_info *l, int eol, void *userdata) 
+{
+    struct GLOBAL *global = userdata;
+    int channels = 1;
+
+    if (eol > 0) 
+	{
+        return;
+    }
+	
+	source_index++;
 	
-	struct paRecordData *pdata = (struct paRecordData*) userdata;
-	/* The sample type to use */
-	pa_sample_spec ss;
-	if (BIGENDIAN)
-		ss.format = PA_SAMPLE_FLOAT32BE;
+	if(l->sample_spec.channels <1)
+		channels = 1;
+	else if (l->sample_spec.channels > 2)
+		channels = 2;
 	else
-		ss.format = PA_SAMPLE_FLOAT32LE;
+		channels = l->sample_spec.channels;
 	
-	__LOCK_MUTEX(__AMUTEX);
-		gboolean capVid = pdata->capVid;
-		int skip_n = pdata->skip_n;
-		pdata->streaming = TRUE;
-		ss.rate = pdata->samprate;
-		ss.channels = pdata->channels;
-	__UNLOCK_MUTEX(__AMUTEX);
-
-	g_print("starting pulse audio thread: %d hz- %d ch\n",ss.rate, ss.channels);
-	if (!(pdata->pulse_simple = pa_simple_new(NULL, "Guvcview Video Capture", PA_STREAM_RECORD, NULL, "pcm.record", &ss, NULL, NULL, &error))) 
+	g_print("======= Input Device #%d =======\n", source_index);
+	g_print("Description: %s\n", l->description);
+    g_print("Name: %s\n", l->name);
+    g_print("Index: %d\n", l->index);
+	g_print("Channels: %d (default to: %d)\n", l->sample_spec.channels, channels);
+	g_print("SampleRate: %d\n", l->sample_spec.rate);
+	g_print("Latency: %llu (usec)\n", (long long unsigned) l->latency);
+	g_print("Card: %d\n", l->card);
+    g_print("\n");
+	
+	if(l->monitor_of_sink == PA_INVALID_INDEX)
 	{
-		g_printerr(": pa_simple_new() failed: %s\n", pa_strerror(error));
-		goto finish;
+		global->Sound_numInputDev++;
+		//allocate new Sound Device Info
+		global->Sound_IndexDev = g_renew(sndDev, global->Sound_IndexDev, global->Sound_numInputDev);
+		//fill structure with sound data
+		global->Sound_IndexDevglobal->Sound_numInputDev-1.id = l->index; /*saves dev id*/
+		strncpy(global->Sound_IndexDevglobal->Sound_numInputDev-1.name,  l->name, 511);
+		strncpy(global->Sound_IndexDevglobal->Sound_numInputDev-1.description, l->description, 255);
+		global->Sound_IndexDevglobal->Sound_numInputDev-1.chan = channels;
+		global->Sound_IndexDevglobal->Sound_numInputDev-1.samprate = l->sample_spec.rate;
 	}
+}
+
+/* 
+ * See above.  This callback is pretty much identical to the previous
+ * but it will only print the output devices
+ */
+void pa_sinklist_cb(pa_context *c, const pa_sink_info *l, int eol, void *userdata) 
+{
+    /* If eol is set to a positive number, you're at the end of the list */
+    if (eol > 0) 
+	{
+        return;
+    }
 	
-	/* Record some data ... */
-	while(capVid)
+	sink_index++;
+	
+	g_print("======= Output Device #%d =======\n", sink_index);
+	g_print("Description: %s\n", l->description);
+	g_print("Name: %s\n", l->name);
+	g_print("Index: %d\n", l->index);
+	g_print("Channels: %d\n", l->channel_map.channels);
+	g_print("SampleRate: %d\n", l->sample_spec.rate);
+	g_print("Latency: %llu (usec)\n", (long long unsigned) l->latency);
+	g_print("Card: %d\n", l->card);
+	g_print("\n");	
+}
+
+/*
+ * iterate the main loop until all devices are listed
+ */
+int pa_get_devicelist(struct GLOBAL *global) 
+{
+	/* Define our pulse audio loop and connection variables */
+	pa_mainloop *pa_ml;
+	pa_mainloop_api *pa_mlapi;
+	pa_operation *pa_op = NULL;
+	pa_context *pa_ctx;
+
+	/* We'll need these state variables to keep track of our requests */
+    int state = 0;
+    int pa_ready = 0;
+
+    /* Create a mainloop API and connection to the default server */
+    pa_ml = pa_mainloop_new();
+    pa_mlapi = pa_mainloop_get_api(pa_ml);
+    pa_ctx = pa_context_new(pa_mlapi, "getDevices");
+
+    /* This function connects to the pulse server */
+    pa_context_connect(pa_ctx, NULL, 0, NULL);
+
+    /* 
+	 * This function defines a callback so the server will tell us it's state.
+     * Our callback will wait for the state to be ready.  The callback will
+     * modify the variable to 1 so we know when we have a connection and it's
+     * ready.
+     * If there's an error, the callback will set pa_ready to 2
+	 */
+    pa_context_set_state_callback(pa_ctx, pa_state_cb, &pa_ready);
+
+    /* 
+	 * Now we'll enter into an infinite loop until we get the data we receive
+     * or if there's an error
+	 */
+    for (;;) 
 	{
-		if (pa_simple_read(pdata->pulse_simple, pdata->recordedSamples, pdata->aud_numBytes, &error) < 0) 
+        /* 
+		 * We can't do anything until PA is ready, so just iterate the mainloop
+         * and continue
+		 */
+        if (pa_ready == 0) 
 		{
-			g_printerr("pulse: pa_simple_read() failed: %s\n", pa_strerror(error));
-			goto finish;
-		}
-
-		__LOCK_MUTEX(__AMUTEX);
-			capVid = pdata->capVid;
-			/*first frame time stamp*/
-			if(pdata->a_ts <= 0)
-			{
-				if((pdata->ts_ref > 0) && (pdata->ts_ref < pdata->snd_begintime)) 
-					pdata->a_ts = pdata->snd_begintime - pdata->ts_ref;
-				else pdata->a_ts = 1;
-			}
-			else /*increment time stamp for audio frame*/
-				pdata->a_ts += (G_NSEC_PER_SEC * pdata->aud_numSamples)/(pdata->samprate * pdata->channels);
-	
-			skip_n = pdata->skip_n;
-		__UNLOCK_MUTEX(__AMUTEX);
-		
-		if (!skip_n) //skip audio while were skipping video frames
+            pa_mainloop_iterate(pa_ml, 1, NULL);
+            continue;
+        }
+        /* We couldn't get a connection to the server, so exit out */
+        if (pa_ready == 2) 
 		{
-			__LOCK_MUTEX( __AMUTEX );
-				if(!pdata->audio_buffpdata->w_ind.used)
+            finish(pa_ctx, pa_ml);
+            return -1;
+        }
+        /* 
+		 * At this point, we're connected to the server and ready to make 
+		 * requests
+		 */
+        switch (state) 
+		{
+            /* State 0: we haven't done anything yet */
+            case 0:
+                /* 
+				 * This sends an operation to the server.  pa_sinklist_cb is
+                 * our callback function and a pointer to our devicelist will
+                 * be passed to the callback (global) The operation ID is stored in the
+                 * pa_op variable
+				 */
+                pa_op = pa_context_get_sink_info_list(pa_ctx,
+                        pa_sinklist_cb,
+                        NULL //userdata
+                        );
+
+                /* Update state for next iteration through the loop */
+                state++;
+                break;
+            case 1:
+                /* 
+				 * Now we wait for our operation to complete.  When it's
+                 * complete our pa_output_devicelist is filled out, and we move
+                 * along to the next state
+				 */
+                if (pa_operation_get_state(pa_op) == PA_OPERATION_DONE) 
 				{
-					
-					/*copy data to audio buffer*/
-					memcpy(pdata->audio_buffpdata->w_ind.frame, pdata->recordedSamples, pdata->aud_numBytes);
-					pdata->audio_buffpdata->w_ind.time_stamp = pdata->a_ts + pdata->delay;
-					pdata->audio_buffpdata->w_ind.used = TRUE;
-					NEXT_IND(pdata->w_ind, AUDBUFF_SIZE);
-				}
-				else
+                    pa_operation_unref(pa_op);
+
+                    /* 
+					 * Now we perform another operation to get the source
+                     * (input device) list just like before.  This time we pass
+                     * a pointer to our input structure
+					 */
+                    pa_op = pa_context_get_source_info_list(pa_ctx,
+                            pa_sourcelist_cb,
+                            global //userdata
+                            );
+                    /* Update the state so we know what to do next */
+                    state++;
+                }
+                break;
+            case 2:
+                if (pa_operation_get_state(pa_op) == PA_OPERATION_DONE) 
 				{
-					//drop audio data
-					g_printerr("AUDIO: droping audio data\n");
-				}
-			__UNLOCK_MUTEX( __AMUTEX );
-		}
-		else 
-		{
-			pdata->snd_begintime = ns_time_monotonic();
-			pdata->a_ts = 0;
-		}
-	}
+                    /* Now we're done, clean up and disconnect and return */
+                    pa_operation_unref(pa_op);
+                    finish(pa_ctx, pa_ml);
+                    return 0;
+                }
+                break;
+            default:
+                /* We should never see this state */
+                g_print("in state %d\n", state);
+                return -1;
+        }
+        /* 
+		 * Iterate the main loop and go again.  The second argument is whether
+         * or not the iteration should block until something is ready to be
+         * done.  Set it to zero for non-blocking.
+		 */
+        pa_mainloop_iterate(pa_ml, 1, NULL);
+    }
+}
+
+/*
+ * get the device list from pulse server
+ */
+int 
+pulse_list_snd_devices(struct GLOBAL *global)
+{
+    global->Sound_numInputDev = 0; //reset input device count
+    global->Sound_DefDev = 0;
+
+    if (pa_get_devicelist(global) < 0) 
+    {
+        g_print("failed to get audio device list from PULSE server\n");
+        return 1;
+    }
+    
+    return 0;
+} 
 
-finish:
-	g_print("audio thread exited\n");
-	pdata->streaming = FALSE;
-	if (pdata->pulse_simple)
-		pa_simple_free(pdata->pulse_simple);
-	return (NULL);
+/*
+ * underflow callback
+ */
+static void 
+stream_underflow_cb(pa_stream *s, void *userdata) 
+{
+    /* We increase the latency by 50% if we get 6 underflows and latency is under 2s */
+    g_print("AUDIO: underflow\n");
+    underflows++;
+    if (underflows >= 6 && latency < 2000000) 
+    {
+        latency = (latency*3)/2;
+        
+        pa_sample_spec *ss = (pa_sample_spec *) pa_stream_get_sample_spec (s);
+        pa_buffer_attr *bufattr = (pa_buffer_attr *) pa_stream_get_buffer_attr    (s);
+        
+        bufattr->fragsize = pa_usec_to_bytes(latency, ss);
+        bufattr->maxlength = pa_usec_to_bytes(latency, ss) * 2;
+        pa_stream_set_buffer_attr(s, bufattr, NULL, NULL);
+        
+        underflows = 0;
+        g_print("AUDIO: latency increased to %d\n", latency);
+    }
 }
 
+/*
+ * audio record callback
+ */
+static void 
+stream_request_cb(pa_stream *s, size_t length, void *userdata) 
+{
+    
+    //struct paRecordData *pdata = (struct paRecordData*) userdata;
+    const void *inputBuffer;
+    //pa_usec_t usec;
+    //int neg;
+    
+    //pa_stream_get_latency(s, &usec, &neg);
+    //g_print("  latency %8d us\n",(int)usec);
+  
+    /*read from stream*/
+    if (pa_stream_peek(s, &inputBuffer, &length) < 0) 
+    {
+        g_print( "pa_stream_peek() failed\n");
+        //quit(1);
+        return;
+    }
+
+    int numSamples= length / sizeof(SAMPLE);
+    
+	record_sound ( inputBuffer, numSamples, userdata );
+        
+    pa_stream_drop(s);
+}
 
+/*
+ * Iterate the main loop while recording is on.
+ * This function runs under it's own thread called by pulse_init_audio
+ */
+static int
+pulse_read_audio(void *userdata)
+{
+    
+    struct paRecordData *pdata = (struct paRecordData*) userdata;
+    
+    g_print("Pulse audio Thread started\n");
+    pa_mainloop *pa_ml;
+    pa_mainloop_api *pa_mlapi;
+    pa_context *pa_ctx;
+    pa_stream *recordstream;
+    pa_buffer_attr bufattr;
+    pa_sample_spec ss;
+    int r;
+    int pa_ready = 0;
+    
+    /* Create a mainloop API and connection to the default server */
+    pa_ml = pa_mainloop_new();
+    pa_mlapi = pa_mainloop_get_api(pa_ml);
+    pa_ctx = pa_context_new(pa_mlapi, "guvcview Pulse API");
+    pa_context_connect(pa_ctx, NULL, 0, NULL);
+
+    /* 
+	 * This function defines a callback so the server will tell us it's state.
+     * Our callback will wait for the state to be ready.  The callback will
+     * modify the variable to 1 so we know when we have a connection and it's
+     * ready.
+     * If there's an error, the callback will set pa_ready to 2
+	 */
+    pa_context_set_state_callback(pa_ctx, pa_state_cb, &pa_ready);
+    
+    /* 
+	 * We can't do anything until PA is ready, so just iterate the mainloop
+     * and continue
+	 */
+    while (pa_ready == 0) 
+    {
+        pa_mainloop_iterate(pa_ml, 1, NULL);
+    }
+    if (pa_ready == 2) 
+    {
+        finish(pa_ctx, pa_ml);
+        return -1;
+    }
+    
+	/* set the sample spec (frame rate, channels and format) */
+    ss.rate = pdata->samprate;
+    ss.channels = pdata->channels;
+    ss.format = PULSE_SAMPLE_TYPE;
+    
+    recordstream = pa_stream_new(pa_ctx, "Record", &ss, NULL);
+    if (!recordstream)
+        g_print("AUDIO: pa_stream_new failed\n");
+    
+    /* define the callbacks */
+    pa_stream_set_read_callback(recordstream, stream_request_cb, (void *) pdata);
+    pa_stream_set_underflow_callback(recordstream, stream_underflow_cb, NULL);
+    
+    /* a possible value is (uint32_t)-1   ~= 2 sec */
+    bufattr.fragsize = pa_usec_to_bytes(latency, &ss);    
+    bufattr.maxlength = pa_usec_to_bytes(latency, &ss) * 2; /* maximum value supported is (uint32_t)-1 */
+    //bufattr.maxlength =  pdata->aud_numSamples * sizeof(SAMPLE) * 2;
+    
+    //bufattr.minreq = pa_usec_to_bytes(0,&ss);
+    //bufattr.prebuf = (uint32_t)-1;
+    //bufattr.tlength = pa_usec_to_bytes(latency,&ss);
+    
+    char * dev = pdata->device_name;
+    g_print("AUDIO: connecting to pulse audio device %s\n\t (channels %d rate %d)\n", dev, ss.channels, ss.rate);
+    r = pa_stream_connect_record(recordstream, dev, &bufattr,
+                                 PA_STREAM_INTERPOLATE_TIMING
+                                |PA_STREAM_ADJUST_LATENCY
+                                |PA_STREAM_AUTO_TIMING_UPDATE);
+    if (r < 0) 
+    {
+        g_print("AUDIO: skip latency adjustment\n");
+        /* Old pulse audio servers don't like the ADJUST_LATENCY flag, 
+		 * so retry without that 
+		 */
+        r = pa_stream_connect_record(recordstream, dev, &bufattr,
+                                     PA_STREAM_INTERPOLATE_TIMING|
+                                     PA_STREAM_AUTO_TIMING_UPDATE);
+    }
+    if (r < 0) 
+    {
+        g_print("AUDIO: pa_stream_connect_record failed\n");
+        finish(pa_ctx, pa_ml);
+        return -1;
+    }
+    
+    pdata->streaming=TRUE;
+    
+    /* 
+     * Iterate the main loop while streaming.  The second argument is whether
+     * or not the iteration should block until something is ready to be
+     * done.  Set it to zero for non-blocking.
+     */
+    while (pdata->capVid) 
+    {
+        pa_mainloop_iterate(pa_ml, 1, NULL);
+        //sleep_ms(4);
+    }
+    
+    pa_stream_disconnect (recordstream);
+    pa_stream_unref (recordstream);
+    finish(pa_ctx, pa_ml);    
+    return 0;
+}
+
+/*
+ * Launch the main loop iteration thread
+ */
 int
 pulse_init_audio(struct paRecordData* pdata)
-{	
-	//start audio capture thread
-	if(__THREAD_CREATE(&pdata->pulse_read_th, (GThreadFunc) pulse_read_audio,pdata))  
-	{
-		g_printerr("Pulse thread creation failed\n");
-		return (-1);
-	}
-	return (0);
-} 
+{    
+    /* start audio capture thread */
+    if(__THREAD_CREATE(&pdata->pulse_read_th, (GThreadFunc) pulse_read_audio, pdata))  
+    {
+        g_printerr("Pulse thread creation failed\n");
+		pdata->streaming=FALSE;
+		
+        return (-1);
+    }
+    
+    return 0;
+}
+
+/*
+ * join the main loop iteration thread
+ */
+int
+pulse_close_audio(struct paRecordData* pdata)
+{
+	__THREAD_JOIN( pdata->pulse_read_th );
+    g_print("AUDIO: pulse read thread joined\n");
+    return 0;
+}
 
 #endif

guvcview-src-1.6.1.tar.gz/src/pulse_audio.h Added

@@ -0,0 +1,39 @@
+/*******************************************************************************#
+#           guvcview              http://guvcview.sourceforge.net               #
+#                                                                               #
+#           Paulo Assis <pj.assis@gmail.com>                                    #
+#                                                                               #
+# 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; either version 2 of the License, or             #
+# (at your option) any later version.                                           #
+#                                                                               #
+# This program is distributed in the hope that it will be useful,               #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of                #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 #
+# GNU General Public License for more details.                                  #
+#                                                                               #
+# You should have received a copy of the GNU General Public License             #
+# along with this program; if not, write to the Free Software                   #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA     #
+#                                                                               #
+********************************************************************************/
+
+#ifdef PULSEAUDIO
+#ifndef PULSE_AUDIO_H
+#define PULSE_AUDIO_H
+
+#include <pulse/pulseaudio.h>
+#include "sound.h"
+
+int
+pulse_list_snd_devices(struct GLOBAL *global);
+
+int
+pulse_init_audio(struct paRecordData* pdata);
+
+int
+pulse_close_audio(struct paRecordData* pdata);
+
+#endif
+#endif

guvcview-src-1.5.3.tar.gz/src/snd_devices.c -> guvcview-src-1.6.1.tar.gz/src/snd_devices.c Changed

@@ -20,110 +20,80 @@
 ********************************************************************************/
 #include <glib.h>
 #include <glib/gprintf.h>
-#include <portaudio.h>
+#include <string.h>
+#include "port_audio.h"
+#include "pulse_audio.h"
+#include "sound.h"
+#include "guvcview.h"
+#include "callbacks.h"
 #include "snd_devices.h"
 
 GtkWidget * 
 list_snd_devices(struct GLOBAL *global)
 {
-	int   it, numDevices, defaultDisplayed;
-	const PaDeviceInfo *deviceInfo;
-
-	//PaError err;
+	int i = 0;
+	
+	switch(global->Sound_API)
+	{
+#ifdef PULSEAUDIO
+		case PULSE:
+			pulse_list_snd_devices(global);
+			break;
+#endif
+		default:
+		case PORT:
+			portaudio_list_snd_devices(global);
+			break;
+	}
 	/*sound device combo box*/
+	
 	GtkWidget *SndDevice = gtk_combo_box_text_new ();
 	
-	numDevices = Pa_GetDeviceCount();
-	if( numDevices < 0 )
-	{
-		g_print( "SOUND DISABLE: Pa_CountDevices returned 0x%x\n", numDevices );
-		//err = numDevices;
-		global->Sound_enable=0;
-	} 
-	else 
+	for(i=0; i < global->Sound_numInputDev; i++)
 	{
-		global->Sound_DefDev = 0;
-			
-		for( it=0; it<numDevices; it++ )
-		{
-			deviceInfo = Pa_GetDeviceInfo( it );
-			if (global->debug) g_print( "--------------------------------------- device #%d\n", it );
-			// Mark global and API specific default devices
-			defaultDisplayed = 0;
-			
-			// with pulse, ALSA is now listed first and doesn't set a API default- 11-2009
-			if( it == Pa_GetDefaultInputDevice() )
-			{
-				if (global->debug) g_print( " Default Input" );
-				defaultDisplayed = 1;
-				global->Sound_DefDev=global->Sound_numInputDev;/*default index in array of input devs*/
-			}
-			else if( it == Pa_GetHostApiInfo( deviceInfo->hostApi )->defaultInputDevice )
-			{
-				const PaHostApiInfo *hostInfo = Pa_GetHostApiInfo( deviceInfo->hostApi );
-				if (global->debug) g_print( " Default %s Input", hostInfo->name );
-				defaultDisplayed = 2;
-				//global->Sound_DefDev=global->Sound_numInputDev;/*index in array of input devs*/
-			}
-			// OUTPUT device doesn't matter for capture
-			if( it == Pa_GetDefaultOutputDevice() )
-			{
-			 	if (global->debug) 
-				{
-					g_print( (defaultDisplayed ? "," : "") );
-					g_print( " Default Output" );
-				}
-				defaultDisplayed = 3;
-			}
-			else if( it == Pa_GetHostApiInfo( deviceInfo->hostApi )->defaultOutputDevice )
-			{
-				const PaHostApiInfo *hostInfo = Pa_GetHostApiInfo( deviceInfo->hostApi );
-				if (global->debug)
-				{
-					g_print( (defaultDisplayed ? "," : "") );                
-					g_print( " Default %s Output", hostInfo->name );/* OSS ALSA etc*/
-				}
-				defaultDisplayed = 4;
-			}
-
-			if( defaultDisplayed!=0 )
-				if (global->debug) g_print( " \n" );
-
-			/* print device info fields */
-			if (global->debug) 
-			{
-				g_print( "Name                     = %s\n", deviceInfo->name );
-				g_print( "Host API                 = %s\n",  Pa_GetHostApiInfo( deviceInfo->hostApi )->name );
-				g_print( "Max inputs = %d", deviceInfo->maxInputChannels  );
-			}
-			// INPUT devices (if it has input channels it's a capture device)
-			if (deviceInfo->maxInputChannels >0) 
-			{ 
-				global->Sound_numInputDev++;
-				//allocate new Sound Device Info
-				global->Sound_IndexDev = g_renew(sndDev, global->Sound_IndexDev, global->Sound_numInputDev);
-				//fill structure with sound data
-				global->Sound_IndexDevglobal->Sound_numInputDev-1.id=it; /*saves dev id*/
-				global->Sound_IndexDevglobal->Sound_numInputDev-1.chan=deviceInfo->maxInputChannels;
-				global->Sound_IndexDevglobal->Sound_numInputDev-1.samprate=deviceInfo->defaultSampleRate;
-				//Sound_IndexDevSound_numInputDev.Hlatency=deviceInfo->defaultHighInputLatency;
-				//Sound_IndexDevSound_numInputDev.Llatency=deviceInfo->defaultLowInputLatency;
-				gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(SndDevice),deviceInfo->name);
-			}
-			if (global->debug) 
-			{
-				g_print( ", Max outputs = %d\n", deviceInfo->maxOutputChannels  );
-				g_print( "Def. low input latency   = %8.3f\n", deviceInfo->defaultLowInputLatency  );
-				g_print( "Def. low output latency  = %8.3f\n", deviceInfo->defaultLowOutputLatency  );
-				g_print( "Def. high input latency  = %8.3f\n", deviceInfo->defaultHighInputLatency  );
-				g_print( "Def. high output latency = %8.3f\n", deviceInfo->defaultHighOutputLatency  );
-				g_print( "Def. sample rate         = %8.2f\n", deviceInfo->defaultSampleRate );
-			}
-			
-		}
-		
-		if (global->debug) g_print("----------------------------------------------\n");
+		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(SndDevice),global->Sound_IndexDevi.description);
 	}
 	
 	return (SndDevice);
 }
+
+void
+update_snd_devices(struct ALL_DATA *all_data)
+{
+	struct GLOBAL *global = all_data->global;
+	struct GWIDGET *gwidget = all_data->gwidget;
+	
+	int i = 0;
+	
+	switch(global->Sound_API)
+	{
+#ifdef PULSEAUDIO
+		case PULSE:
+			pulse_list_snd_devices(global);
+			break;
+#endif
+		default:
+		case PORT:
+			portaudio_list_snd_devices(global);
+			break;
+	}
+	
+	/*disable fps combobox signals*/
+	g_signal_handlers_block_by_func(GTK_COMBO_BOX_TEXT(gwidget->SndDevice), G_CALLBACK (SndDevice_changed), all_data);
+	/* clear out the old device list... */
+	GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model (GTK_COMBO_BOX(gwidget->SndDevice)));
+	gtk_list_store_clear(store);
+	
+	for(i=0; i < global->Sound_numInputDev; i++)
+	{
+		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gwidget->SndDevice), global->Sound_IndexDevi.description);
+	}
+	
+	/*set default device in combo*/
+	global->Sound_UseDev = global->Sound_DefDev;
+	gtk_combo_box_set_active(GTK_COMBO_BOX(gwidget->SndDevice), global->Sound_UseDev);
+	
+	/*enable fps combobox signals*/ 
+	g_signal_handlers_unblock_by_func(GTK_COMBO_BOX_TEXT(gwidget->SndDevice), G_CALLBACK (SndDevice_changed), all_data);
+	
+}

guvcview-src-1.5.3.tar.gz/src/snd_devices.h -> guvcview-src-1.6.1.tar.gz/src/snd_devices.h Changed

guvcview-src-1.5.3.tar.gz/src/sound.c -> guvcview-src-1.6.1.tar.gz/src/sound.c Changed

@@ -22,6 +22,9 @@
 #include <glib/gprintf.h>
 #include <string.h>
 #include <math.h>
+#include "sound.h"
+#include "port_audio.h"
+#include "pulse_audio.h"
 #include "vcodecs.h"
 #include "avilib.h"
 #include "acodecs.h"
@@ -31,11 +34,11 @@
 
 #define __AMUTEX &pdata->mutex
 
-static int fill_audio_buffer(struct paRecordData *pdata, UINT64 ts)
+int fill_audio_buffer(struct paRecordData *pdata, UINT64 ts)
 {
 	int ret =0;
 	UINT64 buffer_length;
-
+	
 	if(pdata->sampleIndex >= pdata->aud_numSamples)
 	{
 		buffer_length = (G_NSEC_PER_SEC * pdata->aud_numSamples)/(pdata->samprate * pdata->channels);
@@ -64,13 +67,53 @@
 		pdata->ts_drift = ts - pdata->a_ts;
 		
 		pdata->sampleIndex = 0; /*reset*/
-		if(!pdata->audio_buffpdata->w_ind.used)
+		
+		__LOCK_MUTEX( __AMUTEX );
+			int flag = pdata->audio_buff_flagpdata->bw_ind;
+		__UNLOCK_MUTEX( __AMUTEX );
+		
+		if(  flag == AUD_READY || flag == AUD_IN_USE )
 		{
+			if(flag == AUD_READY)
+			{
+				/*flag as IN_USE*/
+				__LOCK_MUTEX( __AMUTEX );
+					pdata->audio_buff_flagpdata->bw_ind = AUD_IN_USE;
+				__UNLOCK_MUTEX( __AMUTEX );
+			}
 			/*copy data to audio buffer*/
-			memcpy(pdata->audio_buffpdata->w_ind.frame, pdata->recordedSamples, pdata->aud_numBytes);
-			pdata->audio_buffpdata->w_ind.time_stamp = pdata->a_ts + pdata->delay;
-			pdata->audio_buffpdata->w_ind.used = TRUE;
+			memcpy(pdata->audio_buffpdata->bw_indpdata->w_ind.frame, pdata->recordedSamples, pdata->aud_numBytes);
+			pdata->audio_buffpdata->bw_indpdata->w_ind.time_stamp = pdata->a_ts + pdata->delay;
+			pdata->audio_buffpdata->bw_indpdata->w_ind.used = TRUE;
+			
+			pdata->blast_ind = pdata->bw_ind;
+			pdata->last_ind  = pdata->w_ind;
+			
+			/*doesn't need locking as it's only used in the callback*/
 			NEXT_IND(pdata->w_ind, AUDBUFF_SIZE);
+			
+			if(pdata->w_ind == 0)
+			{
+				/* reached end of current ring buffer 
+				 * flag it as AUD_PROCESS
+				 * move to next one and flag it as AUD_IN_USE (if READY)
+				 */
+				pdata->audio_buff_flagpdata->bw_ind = AUD_PROCESS;
+				
+				__LOCK_MUTEX( __AMUTEX );
+					NEXT_IND(pdata->bw_ind, AUDBUFF_NUM);
+				
+					if(pdata->audio_buff_flagpdata->bw_ind != AUD_READY)
+					{
+						g_printf("AUDIO: next buffer is not yet ready\n");
+					}
+					else
+					{
+						pdata->audio_buff_flagpdata->bw_ind = AUD_IN_USE;
+					}
+				__UNLOCK_MUTEX( __AMUTEX );
+					
+			}
 		}
 		else
 		{
@@ -85,27 +128,25 @@
 
 /*--------------------------- sound callback ------------------------------*/
 int 
-recordCallback (const void *inputBuffer, void *outputBuffer,
-	unsigned long framesPerBuffer,
-	const PaStreamCallbackTimeInfo* timeInfo,
-	PaStreamCallbackFlags statusFlags,
-	void *userData )
+record_sound ( const void *inputBuffer, unsigned long numSamples, void *userData )
 {
 	struct paRecordData *pdata = (struct paRecordData*)userData;
+	
+	__LOCK_MUTEX( __AMUTEX );
+        gboolean capVid = pdata->capVid;
+        int channels = pdata->channels;
+        int skip_n = pdata->skip_n;
+    __UNLOCK_MUTEX( __AMUTEX );
+	
+	const SAMPLE *rptr = (const SAMPLE*) inputBuffer;
+    	int i;
 
-	const SAMPLE *rptr = (const SAMPLE*)inputBuffer;
-	int i;
-	UINT64 ts, nsec_per_frame;
-
+	
+	UINT64 numFrames = numSamples / channels;
 	/* buffer ends at timestamp "now", calculate beginning timestamp */
-	nsec_per_frame = G_NSEC_PER_SEC / pdata->samprate;
-	ts = ns_time_monotonic() - (UINT64) framesPerBuffer * nsec_per_frame;
-
-	__LOCK_MUTEX( __AMUTEX );
-		gboolean capVid = pdata->capVid;
-		int channels = pdata->channels;
-		int skip_n = pdata->skip_n;
-	__UNLOCK_MUTEX( __AMUTEX );
+    UINT64 nsec_per_frame = G_NSEC_PER_SEC / pdata->samprate;
+    
+    UINT64 ts = ns_time_monotonic() - numFrames * nsec_per_frame;
 	
 	if (skip_n > 0) /*skip audio while were skipping video frames*/
 	{
@@ -115,52 +156,49 @@
 			__LOCK_MUTEX( __AMUTEX );
 				pdata->snd_begintime = ns_time_monotonic(); /*reset first time stamp*/
 			__UNLOCK_MUTEX( __AMUTEX );
-			return (paContinue); /*still capturing*/
+			return (0); /*still capturing*/
 		}
 		else
 		{	__LOCK_MUTEX( __AMUTEX );
 				pdata->streaming=FALSE;
 			__LOCK_MUTEX( __AMUTEX );
-			return (paComplete);
+			return (-1); /*capture has stopped*/
 		}
 	}
 	
-	int numSamples= framesPerBuffer * channels;
-
-	__LOCK_MUTEX( __AMUTEX );
-		/*set to FALSE on paComplete*/
-		pdata->streaming=TRUE;
-
-		for( i=0; i<numSamples; i++ )
-		{
-			pdata->recordedSamplespdata->sampleIndex = inputBuffer ? *rptr++ : 0;
-			pdata->sampleIndex++;
-		
-			fill_audio_buffer(pdata, ts);
-
-			/* increment timestamp accordingly while copying */
-			if (i % channels == 0)
-				ts += nsec_per_frame;
-		}
-		
-	__UNLOCK_MUTEX( __AMUTEX );
-
-	if(capVid) return (paContinue); /*still capturing*/
+	// __LOCK_MUTEX( __AMUTEX );
+        // pdata->streaming=TRUE;
+    // __UNLOCK_MUTEX( __AMUTEX );
+    
+    for( i=0; i<numSamples; i++ )
+    {
+        pdata->recordedSamplespdata->sampleIndex = inputBuffer ? *rptr++ : 0;
+        pdata->sampleIndex++;
+        
+        fill_audio_buffer(pdata, ts);
+        
+        /* increment timestamp accordingly while copying */
+        if (i % channels == 0)
+            ts += nsec_per_frame;
+    }
+        
+    
+    if(capVid) return (0); /*still capturing*/
 	else 
-	{
-		__LOCK_MUTEX( __AMUTEX );
-			pdata->streaming=FALSE;
-		__UNLOCK_MUTEX( __AMUTEX );
-		return (paComplete);
-	}
+    {
+        __LOCK_MUTEX( __AMUTEX );
+            pdata->streaming=FALSE;
+            /* mark current buffer as ready to process */
+            pdata->audio_buff_flagpdata->bw_ind = AUD_PROCESS;
+        __UNLOCK_MUTEX( __AMUTEX );
+    }
 	
+	return(-1); /* audio capture stopped*/
 }
 
 void
-set_sound (struct GLOBAL *global, struct paRecordData* pdata, void *lav_aud_data) 
-{
-	struct lavcAData **lavc_data = (struct lavcAData **) lav_aud_data;
-	
+set_sound (struct GLOBAL *global, struct paRecordData* pdata) 
+{	
 	if(global->Sound_SampRateInd==0)
 		global->Sound_SampRate=global->Sound_IndexDevglobal->Sound_UseDev.samprate;/*using default*/
 	
@@ -171,7 +209,8 @@
 			global->Sound_IndexDevglobal->Sound_UseDev.chan : 2;
 	}
 	
-	pdata->audio_buff = NULL;
+	pdata->api = global->Sound_API;
+	pdata->audio_buff0 = NULL;
 	pdata->recordedSamples = NULL;
 	
 	pdata->samprate = global->Sound_SampRate;
@@ -179,23 +218,33 @@
 	__LOCK_MUTEX( __AMUTEX );
 		pdata->skip_n = global->skip_n; /*initial video frames to skip*/
 	__UNLOCK_MUTEX( __AMUTEX );
-	if(global->debug) g_print("using audio codec: 0x%04x\n",global->Sound_Format );
+	if(global->debug)
+	{
+		g_print("using audio codec: 0x%04x\n",global->Sound_Format );
+		g_print("\tchannels: %d  samplerate: %d\n", pdata->channels, pdata->samprate);
+	}
+	
 	switch (global->Sound_Format)
 	{
 		case PA_FOURCC:
 		{
 			pdata->aud_numSamples = MPG_NUM_SAMP * pdata->channels;
+			//outbuffer size in bytes (max value is for pcm 2 bytes per sample)
+			pdata->outbuf_size = pdata->aud_numSamples * 2; //a good value is 240000;
 			break;
 		}
 		default:
 		{
+			//outbuffer size in bytes (max value is for pcm 2 bytes per sample)
+			pdata->outbuf_size = MPG_NUM_SAMP * pdata->channels * 2; //a good value is 240000;
+			
 			/*initialize lavc data*/
-			if(!(*lavc_data)) 
+			if(!(pdata->lavc_data)) 
 			{
-				*lavc_data = init_lavc_audio(pdata, get_ind_by4cc(global->Sound_Format));
+				pdata->lavc_data = init_lavc_audio(pdata, get_ind_by4cc(global->Sound_Format));
 			}
 			/*use lavc audio codec frame size to determine samples*/
-			pdata->aud_numSamples = (*lavc_data)->codec_context->frame_size * pdata->channels;
+			pdata->aud_numSamples = (pdata->lavc_data)->codec_context->frame_size * pdata->channels;
 			break;
 		}
 	}
@@ -226,26 +275,46 @@
 	pdata->delay += global->Sound_delay; /*add predefined delay - def = 0*/
 	
 	/*reset the indexes*/	
-	pdata->r_ind = 0;
-	pdata->w_ind = 0;
+	pdata->r_ind     = 0;
+	pdata->w_ind     = 0;
+	pdata->bw_ind    = 0;
+	pdata->br_ind    = 0;
+	pdata->blast_ind = 0;
+	pdata->last_ind  = 0;
 	/*buffer for video PCM 16 bits*/
 	pdata->pcm_sndBuff=NULL;
-	/*set audio device to use*/
-	pdata->inputParameters.device = global->Sound_IndexDevglobal->Sound_UseDev.id; /* input device */
+	
+	
+	/*set audio device id to use (portaudio)*/
+	pdata->device_id = global->Sound_IndexDevglobal->Sound_UseDev.id; /* input device */
+	
+	
+	/*set audio device to use (pulseudio)*/
+	strncpy(pdata->device_name, global->Sound_IndexDevglobal->Sound_UseDev.name, 511);
 }
 
+
 int
 init_sound(struct paRecordData* pdata)
 {
-	PaError err = paNoError;
-	int i=0;
-	
-	/*alloc audio ring buffer*/
-    	if(!(pdata->audio_buff))
-    	{
-		pdata->audio_buff = g_new0(AudBuff, AUDBUFF_SIZE);
-		for(i=0; i<AUDBUFF_SIZE; i++)
-			pdata->audio_buffi.frame = g_new0(SAMPLE, pdata->aud_numSamples);
+	int err = paNoError;
+	int i = 0;
+	int j = 0;
+	
+	/*alloc audio ring buffers*/
+    if(!(pdata->audio_buff0))
+    {
+		for(j=0; j< AUDBUFF_NUM; j++)
+		{
+			pdata->audio_buffj = g_new0(AudBuff, AUDBUFF_SIZE);
+			for(i=0; i<AUDBUFF_SIZE; i++)
+			{
+				pdata->audio_buffji.frame = g_new0(SAMPLE, pdata->aud_numSamples);
+				pdata->audio_buffji.used = FALSE;
+				pdata->audio_buffji.time_stamp = 0;
+			}
+			pdata->audio_buff_flagj = AUD_READY;
+		}
 	}
 	
 	/*alloc the callback buffer*/
@@ -262,40 +331,9 @@
 #endif
 		case PORT:
 		default:
-			if(pdata->stream)
-			{
-				if( !(Pa_IsStreamStopped( pdata->stream )))
-				{
-					Pa_AbortStream( pdata->stream );
-					Pa_CloseStream( pdata->stream );
-					pdata->stream = NULL;
-				}
-			}
-				
-			pdata->inputParameters.channelCount = pdata->channels;
-			pdata->inputParameters.sampleFormat = PA_SAMPLE_TYPE;
-			if (Pa_GetDeviceInfo( pdata->inputParameters.device ))
-				pdata->inputParameters.suggestedLatency = Pa_GetDeviceInfo( pdata->inputParameters.device )->defaultHighInputLatency;
-			else
-				pdata->inputParameters.suggestedLatency = DEFAULT_LATENCY_DURATION/1000.0;
-			pdata->inputParameters.hostApiSpecificStreamInfo = NULL; 
-	
-			/*---------------------------- start recording Audio. ----------------------------- */
-	
-			err = Pa_OpenStream(
-				&pdata->stream,
-				&pdata->inputParameters,
-				NULL,                  /* &outputParameters, */
-				pdata->samprate,        /* sample rate        */
-				MPG_NUM_SAMP,          /* buffer in frames => Mpeg frame size (samples = 1152 samples * channels)*/
-				paNoFlag,              /* PaNoFlag - clip and dhiter*/
-				recordCallback,        /* sound callback     */
-				pdata );                /* callback userData  */
-	
-			if( err != paNoError ) goto error;
-	
-			err = Pa_StartStream( pdata->stream );
-			if( err != paNoError ) goto error; /*should close the stream if error ?*/
+			err = port_init_audio(pdata);
+			if(err)
+				goto error;
 			break;
 	}
 	
@@ -303,26 +341,27 @@
 	pdata->snd_begintime = ns_time_monotonic();
 
 	return (0);
+	
 error:
-	g_printerr("An error occured while starting the audio API\n" );
-	g_printerr("Error number: %d\n", err );
-	if(pdata->api == PORT) g_printerr("Error message: %s\n", Pa_GetErrorText( err ) ); 
 	pdata->streaming=FALSE;
 	pdata->flush=0;
 	pdata->delay=0;
-	if(pdata->api == PORT)
-	{
-		if(pdata->stream) Pa_AbortStream( pdata->stream );
-	}
+	
 	if(pdata->recordedSamples) g_free( pdata->recordedSamples );
 	pdata->recordedSamples=NULL;
 	if(pdata->audio_buff)
 	{
-		for(i=0; i<AUDBUFF_SIZE; i++)
-			g_free(pdata->audio_buffi.frame);
-		g_free(pdata->audio_buff);
+	
+		for(j=0; j< AUDBUFF_NUM; j++)
+		{
+			for(i=0; i<AUDBUFF_SIZE; i++)
+			{
+				g_free(pdata->audio_buffji.frame);
+			}
+			g_free(pdata->audio_buffj);
+			pdata->audio_buffj = NULL;
+		}
 	}
-	pdata->audio_buff = NULL;
 	/*lavc is allways checked and cleaned when finishing worker thread*/
 	return(-1);
 } 
@@ -330,68 +369,53 @@
 int
 close_sound (struct paRecordData *pdata) 
 {
-	int err = 0;
-	int ret = 0;
-	int i   = 0;
+	int err = 0;	
+	int i= 0, j= 0;
     
 	pdata->capVid = 0;
 	
-	/*stops and closes the audio stream*/
-	if(pdata->stream)
+	switch(pdata->api)
 	{
-		if(Pa_IsStreamActive( pdata->stream ) > 0)
-		{
-			g_print("Aborting audio stream\n");
-			err = Pa_AbortStream( pdata->stream );
-		}
-		else
-		{
-			g_print("Stoping audio stream\n");
-			err = Pa_StopStream( pdata->stream );
-		}
-		if( err != paNoError )
-		{
-			g_printerr("An error occured while stoping the audio stream\n" );
-			g_printerr("Error number: %d\n", err );
-			g_printerr("Error message: %s\n", Pa_GetErrorText( err ) );
-			ret = -1;
-		}
+#ifdef PULSEAUDIO
+		case PULSE:
+			err = pulse_close_audio(pdata);
+			break;
+#endif
+		case PORT:
+		default:
+			err = port_close_audio(pdata);
+			break;
 	}
 	
-	if(pdata->api == PORT)
-	{
-		g_print("Closing audio stream...\n");
-		err = Pa_CloseStream( pdata->stream );
-		if( err != paNoError )
-		{
-			g_printerr("An error occured while closing the audio stream\n" );
-			g_printerr("Error number: %d\n", err );
-			g_printerr("Error message: %s\n", Pa_GetErrorText( err ) );
-			ret = -1;
-		}
-	}
-	pdata->stream = NULL;
 	pdata->flush = 0;
 	pdata->delay = 0; /*reset the audio delay*/
 	
 	/* ---------------------------------------------------------------------
 	 * make sure no operations are performed on the buffers  */
 	__LOCK_MUTEX(__AMUTEX);
+		if(pdata->lavc_data) 
+			clean_lavc_audio(&(pdata->lavc_data));
+		pdata->lavc_data = NULL;
 		/*free primary buffer*/
 		g_free( pdata->recordedSamples );
 		pdata->recordedSamples=NULL;
 		if(pdata->audio_buff)
 		{
-			for(i=0; i<AUDBUFF_SIZE; i++)
-				g_free(pdata->audio_buffi.frame);
-			g_free(pdata->audio_buff);
+			for(j=0; j< AUDBUFF_NUM; j++)
+			{
+				for(i=0; i<AUDBUFF_SIZE; i++)
+				{
+					g_free(pdata->audio_buffji.frame);
+				}
+				g_free(pdata->audio_buffj);
+				pdata->audio_buffj = NULL;
+			}
 		}
-		pdata->audio_buff = NULL;
 		if(pdata->pcm_sndBuff) g_free(pdata->pcm_sndBuff);
 		pdata->pcm_sndBuff = NULL;
 	__UNLOCK_MUTEX(__AMUTEX);
 	
-	return (ret);
+	return (err);
 }
 
 /* saturate float samples to int16 limits*/
@@ -402,16 +426,31 @@
 	return ((gint16) in);
 }
 
-void Float2Int16 (struct paRecordData* pdata, AudBuff *proc_buff)
+void SampleConverter (struct paRecordData* pdata)
 {
-	if (!(pdata->pcm_sndBuff)) 
-		pdata->pcm_sndBuff = g_new0(gint16, pdata->aud_numSamples);
+	if(pdata->lavc_data && pdata->lavc_data->codec_context->sample_fmt == AV_SAMPLE_FMT_FLT)
+	{
+		if(!(pdata->float_sndBuff)) 
+			pdata->float_sndBuff = g_new0(float, pdata->aud_numSamples);
 		
-	int samp = 0;
+		int samp = 0;
 	
-	for(samp=0; samp < pdata->aud_numSamples; samp++)
+		for(samp=0; samp < pdata->aud_numSamples; samp++)
+		{
+			pdata->float_sndBuffsamp = pdata->audio_buffpdata->br_indpdata->r_ind.framesamp;
+		}
+	}
+	else
 	{
-		pdata->pcm_sndBuffsamp = clip_int16(proc_buff->framesamp * 32767.0); //* 32768 + 385;
+		if (!(pdata->pcm_sndBuff)) 
+			pdata->pcm_sndBuff = g_new0(gint16, pdata->aud_numSamples);
+		
+		int samp = 0;
+	
+		for(samp=0; samp < pdata->aud_numSamples; samp++)
+		{
+			pdata->pcm_sndBuffsamp = clip_int16(pdata->audio_buffpdata->br_indpdata->r_ind.framesamp * 32767.0); //* 32768 + 385;
+		}
 	}
 }

guvcview-src-1.5.3.tar.gz/src/sound.h -> guvcview-src-1.6.1.tar.gz/src/sound.h Changed

@@ -22,17 +22,11 @@
 #ifndef SOUND_H
 #define SOUND_H
 
-#include <portaudio.h>
 #include <glib.h>
 #include <pthread.h>
 #include "globals.h"
 #include "../config.h"
-
-#ifdef PULSEAUDIO
-  #include <pulse/simple.h>
-  #include <pulse/error.h>
-  #include <pulse/gccmacro.h>
-#endif
+#include "defs.h"
 
 /*------------- portaudio defs ----------------*/
 /*---- can be override in rc file or GUI ------*/
@@ -47,13 +41,22 @@
 
 #define NUM_CHANNELS    (0) /* 0-device default 1-mono 2-stereo */
 
-#define PA_SAMPLE_TYPE  paFloat32
-#define PA_FOURCC       WAVE_FORMAT_PCM //use PCM 16 bits converted from float
+#define PA_SAMPLE_TYPE     paFloat32
+#define PA_FOURCC          WAVE_FORMAT_PCM //use PCM 16 bits converted from float
+#define PULSE_SAMPLE_TYPE  PA_SAMPLE_FLOAT32LE //for PCM -> PA_SAMPLE_S16LE
+
 
 #define SAMPLE_SILENCE  (0.0f)
 #define MAX_SAMPLE (1.0f)
 #define PRINTF_S_FORMAT "%.8f"
 
+/*buffer flags*/
+#define AUD_IN_USE           0 /* in use by interrupt handler*/
+#define AUD_PROCESS          1 /* ready to process */
+#define AUD_PROCESSING       2 /* processing */
+#define AUD_PROCESSED        3 /* ready to write to disk */
+#define AUD_READY            4 /* ready to re-use by interrupt handler*/
+
 //API index
 #define PORT  0
 #define PULSE 1
@@ -70,52 +73,64 @@
 {
 	int api; //0-Portaudio 1-pulse audio
 	int input_type; // audio SAMPLE type
-	PaStreamParameters inputParameters;
-	PaStream *stream;
-	unsigned long framesPerBuffer; //frames per buffer passed in audio callback
-
-	int w_ind;                    // producer index
-	int r_ind;                    // consumer index
-	int channels;                 // channels
-	gboolean streaming;           // audio streaming flag
-	int flush;                    // flush mp2 buffer flag
-	int samprate;                 // samp rate
-	int numsec;                   // aprox. number of seconds for out buffer size
-	int aud_numBytes;             // bytes copied to out buffer*/
-	int aud_numSamples;           // samples copied to out buffer*/
-	int64_t snd_begintime;        // audio recording start time*/
-	int capVid;                   // video capture flag
-	SAMPLE *recordedSamples;      // callback buffer
+	
+	unsigned long framesPerBuffer;   //frames per buffer passed in audio callback
+	char device_name512;           //device name - for pulse
+	int device_id;                   //device id - for portaudio
+	
+	int w_ind;                       // producer index
+	int r_ind;                       // consumer index
+	int bw_ind;                      // audio_buffer in_use index
+	int br_ind;                      // audio_buffer processing
+	int blast_ind;                   // last in_use index (for vu meter)
+	int last_ind;                    // last producer index (for vu meter)
+	int channels;                    // channels
+	gboolean streaming;              // audio streaming flag
+	int flush;                       // flush mp2 buffer flag
+	int samprate;                    // samp rate
+	int numsec;                      // aprox. number of seconds for out buffer size
+	int aud_numBytes;                // bytes copied to out buffer*/
+	int aud_numSamples;              // samples copied to out buffer*/
+	int64_t snd_begintime;           // audio recording start time*/
+	int capVid;                      // video capture flag
+	SAMPLE *recordedSamples;         // callback buffer
 	int sampleIndex;
-	AudBuff *audio_buff;          // ring buffer for audio data
-	int64_t a_ts;                 // audio frame time stamp
-	int64_t ts_ref;               // timestamp video reference
-	int64_t ts_drift;             // time drift between audio device clock and system clock
-	gint16 *pcm_sndBuff;          // buffer for pcm coding with int16
-	BYTE *mp2Buff;                // mp2 encode buffer
-	int mp2BuffSize;              // mp2 buffer size
-	int snd_Flags;                // effects flag
-	int skip_n;                   // video frames to skip
-	UINT64 delay;                 // in nanosec - h264 has a two frame delay that must be compensated
-
+	AudBuff *audio_buffAUDBUFF_NUM;// ring buffers for audio data captured from device
+	int audio_buff_flagAUDBUFF_NUM;// process_buffer flags
+	int64_t a_ts;                    // audio frame time stamp
+	int64_t ts_ref;                  // timestamp video reference
+	int64_t ts_drift;                // time drift between audio device clock and system clock
+	gint16 *pcm_sndBuff;             // buffer for pcm coding with int16
+	float  *float_sndBuff;           // buffer for pcm coding with float
+	BYTE *mp2Buff;                   // mp2 encode buffer
+	int mp2BuffSize;                 // mp2 buffer size
+	int snd_Flags;                   // effects flag
+	int skip_n;                      // video frames to skip
+	UINT64 delay;                    // in nanosec - h264 has a two frame delay that must be compensated
+	
+	int outbuf_size;	             //size of output buffer
+	struct lavcAData* lavc_data;     //libavcodec data
 	__MUTEX_TYPE mutex;
 	
+	//PORTAUDIO SUPPORT
+	void *stream;
+	
 	//PULSE SUPPORT
 #ifdef PULSEAUDIO
-	pa_simple *pulse_simple;
 	 __THREAD_TYPE pulse_read_th;
+	/*The main loop context*/
+	//GMainContext *maincontext;
 #endif
 };
 
 int 
-recordCallback (const void *inputBuffer, void *outputBuffer,
-	unsigned long framesPerBuffer,
-	const PaStreamCallbackTimeInfo* timeInfo,
-	PaStreamCallbackFlags statusFlags,
-	void *userData );
+record_sound ( const void *inputBuffer, unsigned long numSamples, void *userData );
+
+int 
+fill_audio_buffer(struct paRecordData *pdata, UINT64 ts);
 
 void
-set_sound (struct GLOBAL *global, struct paRecordData* data, void* lav_aud_data);
+set_sound (struct GLOBAL *global, struct paRecordData* data);
 
 int
 init_sound(struct paRecordData* data);
@@ -124,18 +139,7 @@
 close_sound (struct paRecordData *data);
 
 void 
-Float2Int16 (struct paRecordData* data, AudBuff *proc_buff);
-
-#ifdef PULSEAUDIO
-void
-pulse_set_audio (struct GLOBAL *global, struct paRecordData* data);
-
-int
-pulse_init_audio(struct paRecordData* data);
-
-int
-pulse_close_sound (struct paRecordData *data);
-#endif
+SampleConverter (struct paRecordData* data);
 
 #endif

guvcview-src-1.5.3.tar.gz/src/timers.c -> guvcview-src-1.6.1.tar.gz/src/timers.c Changed

@@ -87,25 +87,33 @@
     struct GWIDGET *gwidget = all_data->gwidget;
     struct vdIn *videoIn = all_data->videoIn; 
     
-    /*increment image name */
-    videoIn->ImageFName = incFilename(videoIn->ImageFName, 
-        global->imgFPath,
-        global->image_inc);
+    global->image_picn++;   
 
-    if(!global->no_display)
-    {
-        g_snprintf(global->imageinc_str,24,_("File num:%d"),global->image_inc);
+	if(global->image_inc > 0)
+	{
+		/*increment image name */
+	    videoIn->ImageFName = incFilename(videoIn->ImageFName, 
+    	    global->imgFPath,
+    	    global->image_inc);
         
-        gdk_threads_enter();
-            gtk_label_set_text(GTK_LABEL(gwidget->ImageIncLabel), global->imageinc_str);
-            gdk_flush();
-        gdk_threads_leave();
+    	if(!global->no_display)
+    	{
+        	g_snprintf(global->imageinc_str,24,_("File num:%d"),global->image_inc);
+        
+        	gdk_threads_enter();
+            	gtk_label_set_text(GTK_LABEL(gwidget->ImageIncLabel), global->imageinc_str);
+            	gdk_flush();
+        	gdk_threads_leave();
+    	}
+    
+    	global->image_inc = global->image_picn;
     }
+    else
+    	videoIn->ImageFName = joinPath(videoIn->ImageFName, global->imgFPath);
     
-    global->image_inc++;
     videoIn->capImage = TRUE;
 
-    if(global->image_inc > global->image_npics) 
+    if(global->image_picn > global->image_npics) 
     {   /*destroy timer*/
         if(!global->no_display)
         {
@@ -116,7 +124,7 @@
             gdk_threads_leave();
         }
         global->image_timer=0;
-        
+        global->image_picn=0;
         //if exit_on_close then shutdown
         if(global->exit_on_close)
             shutd (0, data);

guvcview-src-1.5.3.tar.gz/src/v4l2_controls.c -> guvcview-src-1.6.1.tar.gz/src/v4l2_controls.c Changed

@@ -648,11 +648,10 @@
 {  
     struct ALL_DATA *data = (struct ALL_DATA *) all_data;
     struct vdIn *videoIn = data->videoIn;
-    Control *current = control_list;
-    Control *next = current->next;
+    Control *current;
     int i = 0;
     
-    for(; next != NULL; current = next, next = current->next)
+    for(current = control_list; current != NULL; current = current->next)
     {
     	get_ctrl(videoIn->fd, control_list, current->control.id, all_data);
         if (verbose) 
@@ -857,24 +856,26 @@
                             /* check for valid range */
                             if((current->control.maximum > current->control.minimum) && (current->control.step != 0))
                             {
-                                current->widget = gtk_scale_new_with_range (
-                                	GTK_ORIENTATION_HORIZONTAL,
-                                    current->control.minimum,
+                            	GtkAdjustment *adjustment =  gtk_adjustment_new (
+                                	current->value,
+                                	current->control.minimum,
                                     current->control.maximum,
-                                    current->control.step);
+                                    current->control.step,
+                                    current->control.step*10,
+                                    0);
+                                    
+                                current->widget = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
+                                
                                 gtk_scale_set_draw_value (GTK_SCALE (current->widget), FALSE);
                                 gtk_range_set_round_digits(GTK_RANGE (current->widget), 0);
+                                
                                 gtk_widget_show (current->widget);
-                            
-                                current->spinbutton = gtk_spin_button_new_with_range(
-                                    current->control.minimum,
-                                    current->control.maximum,
-                                    current->control.step);
+                                	
+                                current->spinbutton = gtk_spin_button_new(adjustment,current->control.step, 0);
+                                
                                 /*can't edit the spin value by hand*/
-                                gtk_editable_set_editable(GTK_EDITABLE(current->spinbutton),FALSE);
-                            
-                                gtk_range_set_value (GTK_RANGE (current->widget), current->value);
-                                gtk_spin_button_set_value (GTK_SPIN_BUTTON(current->spinbutton), current->value);
+                                gtk_editable_set_editable(GTK_EDITABLE(current->spinbutton),TRUE);
+                                
                                 gtk_widget_show (current->spinbutton);
                              
                                 g_object_set_data (G_OBJECT (current->widget), "control_info", 
@@ -1142,6 +1143,7 @@
             ctrl.string = control->string; 
         }
 #endif
+        ctrls.ctrl_class = control->class;
         ctrls.count = 1;
         ctrls.controls = &ctrl;
         ret = xioctl(hdevice, VIDIOC_G_EXT_CTRLS, &ctrls);
@@ -1360,6 +1362,7 @@
                 ctrl.value = control->value;
                 break;
         }
+        ctrls.ctrl_class = control->class;
         ctrls.count = 1;
         ctrls.controls = &ctrl;
         ret = xioctl(hdevice, VIDIOC_S_EXT_CTRLS, &ctrls);

guvcview-src-1.5.3.tar.gz/src/v4l2_dyna_ctrls.c -> guvcview-src-1.6.1.tar.gz/src/v4l2_dyna_ctrls.c Changed

@@ -34,6 +34,7 @@
 #define LENGTH_OF_XU_CTR (6)
 #define LENGTH_OF_XU_MAP (10)
 
+/*
 static struct uvc_xu_control_info xu_ctrls = 
 {
 	{
@@ -80,6 +81,12 @@
 	},
 	
 };
+*/
+
+static struct uvc_menu_info led_menu_entry4 = {{0, "Off"}, 
+												 {1, "On"}, 
+												 {2, "Blinking"}, 
+												 {3, "Auto"}};
 
 /* mapping for Pan/Tilt/Focus */
 static struct uvc_xu_control_mapping xu_mappings = 
@@ -92,7 +99,10 @@
 		.size      = 16,
 		.offset    = 0,
 		.v4l2_type = V4L2_CTRL_TYPE_INTEGER,
-		.data_type = UVC_CTRL_DATA_TYPE_SIGNED
+		.data_type = UVC_CTRL_DATA_TYPE_SIGNED,
+		.menu_info = NULL,
+		.menu_count = 0,
+		.reserved = {0,0,0,0}
 	},
 	{
 		.id        = V4L2_CID_TILT_RELATIVE,
@@ -102,7 +112,10 @@
 		.size      = 16,
 		.offset    = 16,
 		.v4l2_type = V4L2_CTRL_TYPE_INTEGER,
-		.data_type = UVC_CTRL_DATA_TYPE_SIGNED
+		.data_type = UVC_CTRL_DATA_TYPE_SIGNED,
+		.menu_info = NULL,
+		.menu_count = 0,
+		.reserved = {0,0,0,0}
 	},
 	{
 		.id        = V4L2_CID_PAN_RESET,
@@ -111,8 +124,11 @@
 		.selector  = XU_MOTORCONTROL_PANTILT_RESET,
 		.size      = 1,
 		.offset    = 0,
-		.v4l2_type = V4L2_CTRL_TYPE_INTEGER,
-		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED
+		.v4l2_type = V4L2_CTRL_TYPE_BUTTON,
+		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
+		.menu_info = NULL,
+		.menu_count = 0,
+		.reserved = {0,0,0,0}
 	},
 	{
 		.id        = V4L2_CID_TILT_RESET,
@@ -121,18 +137,11 @@
 		.selector  = XU_MOTORCONTROL_PANTILT_RESET,
 		.size      = 1,
 		.offset    = 1,
-		.v4l2_type = V4L2_CTRL_TYPE_INTEGER,
-		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED
-	},
-	{
-		.id        = V4L2_CID_PANTILT_RESET_LOGITECH,
-		.name      = N_("Pan/tilt Reset"),
-		.entity    = UVC_GUID_LOGITECH_MOTOR_CONTROL,
-		.selector  = XU_MOTORCONTROL_PANTILT_RESET,
-		.size      = 8,
-		.offset    = 0,
-		.v4l2_type = V4L2_CTRL_TYPE_INTEGER,
-		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED
+		.v4l2_type = V4L2_CTRL_TYPE_BUTTON,
+		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
+		.menu_info = NULL,
+		.menu_count = 0,
+		.reserved = {0,0,0,0}
 	},
 	{
 		.id        = V4L2_CID_FOCUS_LOGITECH,
@@ -142,7 +151,10 @@
 		.size      = 8,
 		.offset    = 0,
 		.v4l2_type = V4L2_CTRL_TYPE_INTEGER,
-		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED
+		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
+		.menu_info = NULL,
+		.menu_count = 0,
+		.reserved = {0,0,0,0}
 	},
 	{
 		.id        = V4L2_CID_LED1_MODE_LOGITECH,
@@ -151,8 +163,11 @@
 		.selector  = XU_HW_CONTROL_LED1,
 		.size      = 8,
 		.offset    = 0,
-		.v4l2_type = V4L2_CTRL_TYPE_INTEGER,
-		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED
+		.v4l2_type = V4L2_CTRL_TYPE_MENU,
+		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
+		.menu_info = led_menu_entry,
+		.menu_count = 4,
+		.reserved = {0,0,0,0}
 	},
 	{
 		.id        = V4L2_CID_LED1_FREQUENCY_LOGITECH,
@@ -162,7 +177,10 @@
 		.size      = 8,
 		.offset    = 16,
 		.v4l2_type = V4L2_CTRL_TYPE_INTEGER,
-		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED
+		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
+		.menu_info = NULL,
+		.menu_count = 0,
+		.reserved = {0,0,0,0}
 	},
 	{
 		.id        = V4L2_CID_DISABLE_PROCESSING_LOGITECH,
@@ -172,7 +190,10 @@
 		.size      = 8,
 		.offset    = 0,
 		.v4l2_type = V4L2_CTRL_TYPE_BOOLEAN,
-		.data_type = UVC_CTRL_DATA_TYPE_BOOLEAN
+		.data_type = UVC_CTRL_DATA_TYPE_BOOLEAN,
+		.menu_info = NULL,
+		.menu_count = 0,
+		.reserved = {0,0,0,0}
 	},
 	{
 		.id        = V4L2_CID_RAW_BITS_PER_PIXEL_LOGITECH,
@@ -182,7 +203,10 @@
 		.size      = 8,
 		.offset    = 0,
 		.v4l2_type = V4L2_CTRL_TYPE_INTEGER,
-		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED
+		.data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
+		.menu_info = NULL,
+		.menu_count = 0,
+		.reserved = {0,0,0,0}
 	},
 	
 };
@@ -191,25 +215,6 @@
 {
 	int i=0;
 	int err=0;
-	/* try to add all controls listed above */
-	for ( i=0; i<LENGTH_OF_XU_CTR; i++ ) 
-	{
-		g_print("Adding control for %s\n", xu_mappingsi.name);
-		if ((err=xioctl(fd, UVCIOC_CTRL_ADD, &xu_ctrlsi)) < 0 ) 
-		{
-			if ((errno != EEXIST) || (errno != EACCES)) 
-			{	perror("UVCIOC_CTRL_ADD - Error");
-				return (-2);
-			}
-			else if (errno == EACCES)
-			{
-				g_printerr("need admin previledges for adding extension controls\n");
-				g_printerr("please run 'guvcview --add_ctrls' as root (or with sudo)\n");
-				return  (-1);
-			}
-			else perror("Control exists");
-		}
-	}
 	/* after adding the controls, add the mapping now */
 	for ( i=0; i<LENGTH_OF_XU_MAP; i++ ) 
 	{
@@ -219,7 +224,7 @@
 			if ((errno!=EEXIST) || (errno != EACCES))
 			{
 				perror("UVCIOC_CTRL_MAP - Error");
-				return (-2);
+				//return (-2);
 			}
 			else if (errno == EACCES)
 			{

guvcview-src-1.5.3.tar.gz/src/v4l2_dyna_ctrls.h -> guvcview-src-1.6.1.tar.gz/src/v4l2_dyna_ctrls.h Changed

@@ -23,17 +23,11 @@
 #define V4L2_DYNA_CTRLS_H
 
 #include <linux/videodev2.h>
+#include <linux/uvcvideo.h>
 /*
  * Dynamic controls
  */
 
-#define UVC_CTRL_DATA_TYPE_RAW		0
-#define UVC_CTRL_DATA_TYPE_SIGNED	1
-#define UVC_CTRL_DATA_TYPE_UNSIGNED	2
-#define UVC_CTRL_DATA_TYPE_BOOLEAN	3
-#define UVC_CTRL_DATA_TYPE_ENUM		4
-#define UVC_CTRL_DATA_TYPE_BITMASK	5
-
 #define V4L2_CID_BASE_EXTCTR				0x0A046D01
 #define V4L2_CID_BASE_LOGITECH				V4L2_CID_BASE_EXTCTR
 //#define V4L2_CID_PAN_RELATIVE_LOGITECH		V4L2_CID_BASE_LOGITECH
@@ -59,53 +53,6 @@
 #define XU_COLOR_PROCESSING_DISABLE		5
 #define XU_RAW_DATA_BITS_PER_PIXEL		8
 
-#define UVC_CONTROL_SET_CUR	(1 << 0)
-#define UVC_CONTROL_GET_CUR	(1 << 1)
-#define UVC_CONTROL_GET_MIN	(1 << 2)
-#define UVC_CONTROL_GET_MAX	(1 << 3)
-#define UVC_CONTROL_GET_RES	(1 << 4)
-#define UVC_CONTROL_GET_DEF	(1 << 5)
-/* Control should be saved at suspend and restored at resume. */
-#define UVC_CONTROL_RESTORE	(1 << 6)
-/* Control can be updated by the camera. */
-#define UVC_CONTROL_AUTO_UPDATE	(1 << 7)
-
-#define UVC_CONTROL_GET_RANGE   (UVC_CONTROL_GET_CUR | UVC_CONTROL_GET_MIN | \
-                                 UVC_CONTROL_GET_MAX | UVC_CONTROL_GET_RES | \
-                                 UVC_CONTROL_GET_DEF)
-
-struct uvc_xu_control_info {
-	__u8 entity16;
-	__u8 index;
-	__u8 selector;
-	__u16 size;
-	__u32 flags;
-};
-
-struct uvc_xu_control_mapping {
-	__u32 id;
-	__u8 name32;
-	__u8 entity16;
-	__u8 selector;
-
-	__u8 size;
-	__u8 offset;
-	enum v4l2_ctrl_type v4l2_type;
-	__u32 data_type;
-};
-
-struct uvc_xu_control {
-	__u8 unit;
-	__u8 selector;
-	__u16 size;
-	__u8 *data;
-};
-
-#define UVCIOC_CTRL_ADD		_IOW('U', 1, struct uvc_xu_control_info)
-#define UVCIOC_CTRL_MAP		_IOWR('U', 2, struct uvc_xu_control_mapping)
-#define UVCIOC_CTRL_GET		_IOWR('U', 3, struct uvc_xu_control)
-#define UVCIOC_CTRL_SET		_IOW('U', 4, struct uvc_xu_control)
-
 int initDynCtrls(int fd);
 
 #endif

guvcview-src-1.5.3.tar.gz/src/v4l2_formats.c -> guvcview-src-1.6.1.tar.gz/src/v4l2_formats.c Changed

guvcview-src-1.5.3.tar.gz/src/v4l2_formats.h -> guvcview-src-1.6.1.tar.gz/src/v4l2_formats.h Changed

guvcview-src-1.5.3.tar.gz/src/v4l2uvc.c -> guvcview-src-1.6.1.tar.gz/src/v4l2uvc.c Changed

@@ -604,6 +604,7 @@
 			vd->framebuffer = g_new0(unsigned char, framebuf_size);
 			break;
 			
+	    case V4L2_PIX_FMT_Y10BPACK:
 	    case V4L2_PIX_FMT_Y16:
 			// alloc a temp buffer for converting to YUYV
 			tmpbuf_size= width * height * 2; // 2 byte per pixel
@@ -952,6 +953,11 @@
 			grey_to_yuyv(vd->framebuffer, vd->tmpbuffer, width, height);
 			break;
 			
+		case V4L2_PIX_FMT_Y10BPACK:
+			memcpy(vd->tmpbuffer, vd->memvd->buf.index,vd->buf.bytesused);
+			y10b_to_yuyv(vd->framebuffer, vd->tmpbuffer, width, height);
+			break;
+		
 	    case V4L2_PIX_FMT_Y16:
 			memcpy(vd->tmpbuffer, vd->memvd->buf.index,vd->buf.bytesused);
 			y16_to_yuyv(vd->framebuffer, vd->tmpbuffer, width, height);
@@ -1080,7 +1086,7 @@
 					video_disable(vd);
 					input_set_framerate (vd, fps, fps_num);
 					video_enable(vd);
-					vd->setFPS = 0; /*no need to query and queue buufers*/
+					vd->setFPS = 0; /*no need to query and queue buffers*/
 				}
 				vd->buf.bytesused = v4l2_read (vd->fd, vd->memvd->buf.index, vd->buf.length);
 				vd->timestamp = ns_time_monotonic();
@@ -1122,10 +1128,10 @@
 						video_disable(vd);
 						unmap_buff(vd);
 						input_set_framerate (vd, fps, fps_num);
+						vd->setFPS = 0;
 						query_buff(vd);
 						queue_buff(vd);
 						video_enable(vd);
-						vd->setFPS = 0;
 					}
 					else if(vd->setJPEGCOMP) //change jpeg quality/compression in video frame
 					{
@@ -1298,6 +1304,13 @@
 	fd = device->fd;
 
 	device->streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+	ret = xioctl(fd, VIDIOC_G_PARM, &device->streamparm);
+	if (ret < 0)
+		return ret;
+
+	if (!(device->streamparm.parm.capture.capability & V4L2_CAP_TIMEPERFRAME))
+		return -ENOTSUP;
+
 	device->streamparm.parm.capture.timeperframe.numerator = *fps_num;
 	device->streamparm.parm.capture.timeperframe.denominator = *fps;
 	 
@@ -1328,6 +1341,7 @@
 
 	fd = device->fd;
 
+	device->streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 	ret = xioctl(fd,VIDIOC_G_PARM,&device->streamparm);
 	if (ret < 0) 
 	{
@@ -1335,9 +1349,17 @@
 	} 
 	else 
 	{
-		// it seems numerator is allways 1 but we don't do assumptions here :-)
-		*fps = device->streamparm.parm.capture.timeperframe.denominator;
-		*fps_num = device->streamparm.parm.capture.timeperframe.numerator;
+		if (device->streamparm.parm.capture.capability & V4L2_CAP_TIMEPERFRAME) {
+			// it seems numerator is allways 1 but we don't do assumptions here :-)
+			*fps = device->streamparm.parm.capture.timeperframe.denominator;
+			*fps_num = device->streamparm.parm.capture.timeperframe.numerator;
+		}
 	}
+	
+	if(*fps == 0 )
+		*fps = 1;
+	if(*fps_num == 0)
+		*fps_num = 1;
+
 	return ret;
 }

guvcview-src-1.5.3.tar.gz/src/vcodecs.c -> guvcview-src-1.6.1.tar.gz/src/vcodecs.c Changed

@@ -35,6 +35,8 @@
 #define CODEC_FLAG2_INTRA_REFRESH 0
 #endif
 
+#define __FMUTEX &global->file_mutex
+
 static BITMAPINFOHEADER mkv_codecPriv =
 {
 	.biSize = 0x00000028, //40 bytes 
@@ -378,7 +380,7 @@
 		.fps          = 0,
 		.monotonic_pts= 1,
 		.bit_rate     = 1500000,
-		.qmax         = 21,
+		.qmax         = 51,
 		.qmin         = 10,
 		.max_qdiff    = 4,
 		.dia          = 2,
@@ -389,10 +391,10 @@
 		.me_sub_cmp   = 3,
 		.last_pred    = 2,
 		.gop_size     = 100,
-		.qcompress    = 0.4,
-		.qblur        = 0.2,
+		.qcompress    = 0.6,
+		.qblur        = 0.5,
 		.subq         = 5,
-		.framerefs    = 2,
+		.framerefs    = 0,
 		.codec_id     = CODEC_ID_H264,
 		.mb_decision  = FF_MB_DECISION_RD,
 		.trellis      = 0,
@@ -400,7 +402,11 @@
 		.mpeg_quant   = 1,
 		.max_b_frames = 0,
 		.num_threads  = 1,
+#if LIBAVCODEC_VER_AT_LEAST(54,01)
+		.flags        = CODEC_FLAG2_INTRA_REFRESH
+#else
 		.flags        = CODEC_FLAG2_BPYRAMID | CODEC_FLAG2_WPRED | CODEC_FLAG2_FASTPSKIP | CODEC_FLAG2_INTRA_REFRESH
+#endif
 	}
 };
 
@@ -509,6 +515,7 @@
 	
 	int ret =0;
 	
+	__LOCK_MUTEX( __FMUTEX );
 	switch (global->VidFormat)
 	{
 		case AVI_FORMAT:
@@ -527,6 +534,7 @@
 			
 			break;
 	}
+	__UNLOCK_MUTEX( __FMUTEX );
 	
 	return (ret);
 }
@@ -578,8 +586,7 @@
 	long framesize = 0;
 	int jpeg_size = 0;
 	int ret = 0;
-	
-	videoF->old_vpts = videoF->vpts;			
+				
 	videoF->vpts = proc_buff->time_stamp;
 	
 	switch (global->VidCodec)

guvcview-src-1.5.3.tar.gz/src/video.c -> guvcview-src-1.6.1.tar.gz/src/video.c Changed

Build Results
RPM Lint

Refresh

Comments for request 267 0

Request History

zaitor created request over 11 years ago

Update to ver 1.6.1, does not build for 11.4 anymore.

mrdocs accepted request over 12 years ago

Looks good to me. I think 11.4 can be fixed simply with an additional dependency.